Author: matt
Date: 2010-12-20 05:59:09 -0800 (Mon, 20 Dec 2010)
New Revision: 8076
Log:
#2490: attempt to fix the issue. PLease test on 1.3 w/X11
Modified:
branches/branch-1.3/src/Fl_Menu.cxx
Modified: branches/branch-1.3/src/Fl_Menu.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu.cxx 2010-12-20 13:57:11 UTC (rev 8075)
+++ branches/branch-1.3/src/Fl_Menu.cxx 2010-12-20 13:59:09 UTC (rev 8076)
@@ -38,9 +38,6 @@
#include <stdio.h>
#include "flstring.h"
-#ifdef __APPLE__
-# include <Carbon/Carbon.h>
-#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 @@
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 @@
}
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
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
