diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-12-18 20:11:24 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-12-18 20:11:24 +0000 |
| commit | bdbea142186f81c0efeb00db4a5d3c8722b6496c (patch) | |
| tree | b814741914b8cea0e6f73469417733418ee8e9e6 /FL | |
| parent | 73a30359b9a02fe1d198230184ee38663cac10c6 (diff) | |
Patched for Cocoa.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6971 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar.H | 8 | ||||
| -rw-r--r-- | FL/mac.H | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index 8c8cbfd40..794cac5fd 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -39,13 +39,15 @@ protected: public: Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0) : Fl_Menu_Bar(x,y,w,h,l) { - deactivate(); // don't let the old area take events - fl_sys_menu_bar = this; - } + deactivate(); // don't let the old area take events + fl_sys_menu_bar = this; + } void menu(const Fl_Menu_Item *m); +#ifdef __APPLE_COCOA__ int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0); void remove(int n); void replace(int rank, const char *name); +#endif }; #else @@ -163,6 +163,7 @@ extern void MacUnmapWindow(Fl_Window*,void *); extern WindowRef MACwindowRef(Fl_Window *w); extern Fl_Region MacRectRegionIntersect(Fl_Region current, int x,int y,int w, int h); extern void MacCollapseWindow(Window w); +extern void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut = 0); #else extern void MacDestroyWindow(Fl_Window*,WindowPtr); extern void MacMapWindow(Fl_Window*,WindowPtr); |