From fa668df1ee02bf063f2fda760fa513b9f56fc75d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Tue, 6 Jul 2004 15:05:47 +0000 Subject: [PATCH] call gtk_menu_set_monitor() only for GTK+ < 2.4.4 and added a #warning 2004-07-06 Michael Natterer * app/widgets/gimpwidgets-utils.c (gimp_menu_position) (gimp_button_menu_position): call gtk_menu_set_monitor() only for GTK+ < 2.4.4 and added a #warning about it. --- ChangeLog | 6 ++++++ app/widgets/gimpwidgets-utils.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e80f4e141..bdaddd3dd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-06 Michael Natterer + + * app/widgets/gimpwidgets-utils.c (gimp_menu_position) + (gimp_button_menu_position): call gtk_menu_set_monitor() only + for GTK+ < 2.4.4 and added a #warning about it. + 2004-07-06 Sven Neumann * plug-ins/gimpressionist: applied patch from Shlomi Fish that diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index 959611383d..e442bfbb5f 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -301,7 +301,10 @@ gimp_menu_position (GtkMenu *menu, gtk_menu_set_screen (menu, screen); - if (TRUE /* gtk_check_version (2, 4, 1) */) +#ifdef __GNUC__ +#warning FIXME: remove this hack as soon as we depend on GTK+ 2.4.4 +#endif + if (gtk_check_version (2, 4, 4)) gtk_menu_set_monitor (menu, monitor); gtk_widget_size_request (widget, &requisition); @@ -377,7 +380,10 @@ gimp_button_menu_position (GtkWidget *button, gtk_menu_set_screen (menu, screen); - if (TRUE /* gtk_check_version (2, 4, 1) */) +#ifdef __GNUC__ +#warning FIXME: remove this hack as soon as we depend on GTK+ 2.4.4 +#endif + if (gtk_check_version (2, 4, 4)) gtk_menu_set_monitor (menu, monitor); *x += button->allocation.x;