head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.116 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.114 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.112 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.110 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.108 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.106 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.104 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.102 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.100 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.98 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.96 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.94 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.92 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.90 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.88 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.86 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.84 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.82 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.80 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.78 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.76 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.74 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.72 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.68 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.48 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.70 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.66 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.64 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.62 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.60 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.58 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.56 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.54 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.52 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.50 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.46 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.44 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.42 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.40 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.38 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.36 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.34 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.32 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.30 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.28 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.26 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.24 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.22 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.20 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.18 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.16 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.14 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.12 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.10 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.8 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.6 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.4 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.28 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.26 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.24 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.22 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.20 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.18 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.16 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.14 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.12 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.10 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.8 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.6 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.4 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.2 cube-native-xorg-base:1.1; locks; strict; comment @# @; 1.2 date 2011.11.25.21.42.44; author joerg; state Exp; branches; next 1.1; 1.1 date 2008.08.17.04.01.37; author dholland; state Exp; branches; next ; desc @@ 1.2 log @Fix build with modern GCC @ text @$NetBSD: patch-at,v 1.1 2008/08/17 04:01:37 dholland Exp $ --- rf/uwidget.cpp.orig 2003-01-14 18:07:42.000000000 +0000 +++ rf/uwidget.cpp @@@@ -24,7 +24,9 @@@@ #include "config.h" #endif +#include #include +#include #include "uwidget.h" #include "uconsole.h" @@@@ -231,23 +233,23 @@@@ extern "C" static void gtkclicked(GtkButton *button, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); UEventSendMessage(widid, EV_CMD, cmdid, 0L); } static void gtkmenuitemactivate(GtkMenuItem *menuitem, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); UEventSendMessage(widid, EV_CMD, cmdid, 0L); } static void gtkselectclist(GtkWidget *clist, gint row, gint column, GdkEventButton *event, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); gchar *text; gtk_clist_get_text(GTK_CLIST(clist), row, column, &text); UEventSendMessage(widid, EV_LIST_SELECTING, UMAKEINT(cmdid, row), text); @@@@ -255,15 +257,15 @@@@ extern "C" static void gtkselectclistcolumn(GtkCList *clist, gint column, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); UEventSendMessage(widid, EV_LIST_SELCOLUMN, UMAKEINT(cmdid, column), 0L); } static gint gtkclistdblclick(GtkWidget *widget, GdkEventButton *event, gpointer data) { - int widid = ULOWORD((int)data); - int cmdid = UHIWORD((int)data); + int widid = ULOWORD((int)(intptr_t)data); + int cmdid = UHIWORD((int)(intptr_t)data); if (event->type == GDK_2BUTTON_PRESS) { UEventSendMessage(widid, EV_LIST_DBLCLICK, cmdid, 0L); @@@@ -274,8 +276,8 @@@@ extern "C" static void gtkcomboclicked(GtkWidget *widget, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); GtkList *list = GTK_LIST(widget->parent); GList *selection = list->selection; @@@@ -320,8 +322,8 @@@@ extern "C" static void gtkmenuactivated(GtkWidget *widget, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); UStr selTxt; @@@@ -392,7 +394,7 @@@@ extern "C" static void dataForeach(GQuark key_id, gpointer data, gpointer user_data) { const char *str = g_quark_to_string(key_id); - int id = (int)user_data; + int id = (int)(intptr_t)user_data; int cmd; if(matchToken(str, cmd)) { @@@@ -514,32 +516,32 @@@@ extern "C" static void gtktreeexpand(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 0), item); } static void gtktreecollapse(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_EXPANDING, UMAKEINT(cmdid, 1), item); } static void gtktreeselect(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 0), item); } static void gtktreedeselect(GtkWidget *item, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); g_assert(GTK_IS_TREE_ITEM(item)); UEventSendMessage(widid, EV_TREE_SELECTING, UMAKEINT(cmdid, 1), item); } @@@@ -661,8 +663,8 @@@@ extern "C" gint page_num, gpointer data) { - int widid = ULOWORD((int)data); - int cmdid = UHIWORD((int)data); + int widid = ULOWORD((int)(intptr_t)data); + int cmdid = UHIWORD((int)(intptr_t)data); UEventSendMessage(widid, EV_PAGE_CHANGED, UMAKEINT(cmdid, page_num), 0L); } @@@@ -682,8 +684,8 @@@@ extern "C" static gint gtkexposeevent(GtkWidget *widget, GdkEvent *event, gpointer user_data) { - int widid = ULOWORD((int)user_data); - int cmdid = UHIWORD((int)user_data); + int widid = ULOWORD((int)(intptr_t)user_data); + int cmdid = UHIWORD((int)(intptr_t)user_data); UEventSendMessage(widid, EV_CUSTOM_DRAW, cmdid, event); return TRUE; @ 1.1 log @Fix broken 64-bit build. @ text @d1 1 a1 1 $NetBSD$ d3 13 a15 3 --- rf/uwidget.cpp~ 2003-01-14 13:07:42.000000000 -0500 +++ rf/uwidget.cpp 2008-08-16 23:58:08.000000000 -0400 @@@@ -231,23 +231,23 @@@@ extern "C" d45 1 a45 1 @@@@ -255,15 +255,15 @@@@ extern "C" d65 1 a65 1 @@@@ -274,8 +274,8 @@@@ extern "C" d76 1 a76 1 @@@@ -320,8 +320,8 @@@@ extern "C" d87 1 a87 1 @@@@ -392,7 +392,7 @@@@ extern "C" d96 1 a96 1 @@@@ -514,32 +514,32 @@@@ extern "C" d137 1 a137 1 @@@@ -661,8 +661,8 @@@@ extern "C" d148 1 a148 1 @@@@ -682,8 +682,8 @@@@ extern "C" @