diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-10 18:09:52 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-12-10 18:09:52 +0000 |
| commit | 071e6f80e592d72649824a006017b32291ddb201 (patch) | |
| tree | 0615cd06ef22d965b75dcae1f2b1659d0f9ad9e3 /gtk/toolbar.c | |
| parent | ec423bd3fbdee77ce798272ea56eb564ec031b1e (diff) | |
Fix conversions so compiles for both 32-bit and 64-bit
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23826 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/toolbar.c')
| -rw-r--r-- | gtk/toolbar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 45dc7fe93b..3c8096ec4c 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -381,7 +381,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) { GTK_STOCK_SAVE); gtk_tool_item_set_tooltip(save_button, tooltips, SAVE_BUTTON_TOOLTIP_TEXT, NULL); - OBJECT_SET_DATA(save_button, "save", (gpointer)TRUE); + OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(1)); #else /* GTK_CHECK_VERSION(2,4,0) */ gtk_widget_hide(GTK_WIDGET(save_as_button)); gtk_widget_show(GTK_WIDGET(save_button)); @@ -392,7 +392,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) { GTK_STOCK_SAVE_AS); gtk_tool_item_set_tooltip(save_button, tooltips, SAVE_AS_BUTTON_TOOLTIP_TEXT, NULL); - OBJECT_SET_DATA(save_button, "save", (gpointer)FALSE); + OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(0)); #else /* GTK_CHECK_VERSION(2,4,0) */ gtk_widget_show(GTK_WIDGET(save_as_button)); gtk_widget_hide(GTK_WIDGET(save_button)); @@ -408,7 +408,7 @@ void set_toolbar_for_unsaved_capture_file(gboolean have_unsaved_capture_file) { */ static void file_save_or_save_as_cmd_cb(GtkWidget *w, gpointer data) { - if ((gboolean)OBJECT_GET_DATA(save_button,"save")) { + if (GPOINTER_TO_INT(OBJECT_GET_DATA(save_button,"save")) == 1) { file_save_cmd_cb(w, data); } else { @@ -695,7 +695,7 @@ toolbar_new(void) /* Only create a separate button in GTK < 2.4. With GTK 2.4+, we will * just modify the save_button to read/show save or save as as needed. * We'll also fudge in an object key ("save") for the save button with data which specifies - * whether the button is currently "save" (TRUE)or "save as" (FALSE). + * whether the button is currently "save" (1)or "save as" (0). * The fcn file_save_or_save_as_cmd_cb * will then call the appropriate file_save_cmd_cb or file_save_as_cmd_cb */ @@ -708,7 +708,7 @@ toolbar_new(void) #else toolbar_item(save_button, window, main_tb, GTK_STOCK_SAVE, tooltips, SAVE_BUTTON_TOOLTIP_TEXT, stock_save_24_xpm, file_save_or_save_as_cmd_cb, NULL); - OBJECT_SET_DATA(save_button, "save", (gpointer)TRUE); + OBJECT_SET_DATA(save_button, "save", GINT_TO_POINTER(1)); #endif toolbar_item(close_button, window, main_tb, |