diff options
| author | Berke Viktor <bviktor@hexchat.org> | 2012-07-14 20:46:42 +0200 |
|---|---|---|
| committer | Berke Viktor <bviktor@hexchat.org> | 2012-07-14 20:46:42 +0200 |
| commit | c80cb47e5cf49c7aa0b162fc509ab08fd1b17e8a (patch) | |
| tree | f16850554ffab9559826c96e728a0297777e7659 /src/fe-gtk/menu.c | |
| parent | a5cc3b15d7eb98c25ff58063079b969ad3b56e3f (diff) | |
Update XChat to r1516
Diffstat (limited to 'src/fe-gtk/menu.c')
| -rw-r--r-- | src/fe-gtk/menu.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 662608d3..c4912212 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -565,10 +565,8 @@ menu_destroy (GtkWidget *menu, gpointer objtounref) static void menu_popup (GtkWidget *menu, GdkEventButton *event, gpointer objtounref) { -#if (GTK_MAJOR_VERSION != 2) || (GTK_MINOR_VERSION != 0) if (event && event->window) gtk_menu_set_screen (GTK_MENU (menu), gdk_drawable_get_screen (event->window)); -#endif g_object_ref (menu); g_object_ref_sink (menu); @@ -1746,8 +1744,6 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock) return item; } -#if GTK_CHECK_VERSION(2,4,0) - /* Override the default GTK2.4 handler, which would make menu bindings not work when the menu-bar is hidden. */ static gboolean @@ -1761,9 +1757,6 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data) #endif } -#endif - - /* === STUFF FOR /MENU === */ static GtkMenuItem * @@ -2139,10 +2132,8 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel, /* /MENU needs to know this later */ g_object_set_data (G_OBJECT (menu_bar), "accel", accel_group); -#if GTK_CHECK_VERSION(2,4,0) g_signal_connect (G_OBJECT (menu_bar), "can-activate-accel", G_CALLBACK (menu_canacaccel), 0); -#endif /* set the initial state of toggles */ mymenu[MENUBAR_OFFSET].state = !prefs.hidemenu; |