fltk
/
fltk
mirror of https://github.com/fltk/fltk.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

#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
pull/49/head
Matthias Melcher 15 years ago
parent
1e9e3970bd
commit
b802aa2ffd
1 changed files with 2 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/Fl_Menu.cxx

7
src/Fl_Menu.cxx
Unescape View File

@ -38,9 +38,6 @@
#include <stdio.h> #include <stdio.h>
#include "flstring.h" #include "flstring.h"
#ifdef __APPLE__
# include <Carbon/Carbon.h>
#endif
/** Size of the menu starting from this menu item */ /** Size of the menu starting from this menu item */
int Fl_Menu_Item::size() const { int Fl_Menu_Item::size() const {
const Fl_Menu_Item* m = this; const Fl_Menu_Item* m = this;
@ -99,7 +96,7 @@ class menuwindow : public Fl_Menu_Window {
public: public:
menutitle* title; menutitle* title;
int handle(int); int handle(int);
#ifdef __APPLE__ #if defined (__APPLE__) || defined (USE_X11)
int early_hide_handle(int); int early_hide_handle(int);
#endif #endif
int itemheight; // zero == menubar 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) { 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. // This off-route takes care of the "detached menu" bug on OS X.
// Apple event handler requires that we hide all menu windows right // Apple event handler requires that we hide all menu windows right
// now, so that Carbon can continue undisturbed with handling window // now, so that Carbon can continue undisturbed with handling window

Write Preview
Loading…
Cancel
Save