From b802aa2ffd8ee14fc4a4eca33c565c5e0b6701d3 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 20 Dec 2010 13:59:09 +0000 Subject: [PATCH] #2490: attempt to fix the issue. PLease test on 1.3 w/X11 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8076 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Menu.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 632724ae8..804568d28 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -38,9 +38,6 @@ #include #include "flstring.h" -#ifdef __APPLE__ -# include -#endif /** Size of the menu starting from this menu item */ int Fl_Menu_Item::size() const { const Fl_Menu_Item* m = this; @@ -99,7 +96,7 @@ class menuwindow : public Fl_Menu_Window { public: menutitle* title; int handle(int); -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (USE_X11) int early_hide_handle(int); #endif int itemheight; // zero == menubar @@ -626,7 +623,7 @@ static int backward(int menu) { // previous item in menu menu if possible } int menuwindow::handle(int e) { -#ifdef __APPLE__ +#if defined (__APPLE__) || defined (USE_X11) // This off-route takes care of the "detached menu" bug on OS X. // Apple event handler requires that we hide all menu windows right // now, so that Carbon can continue undisturbed with handling window