diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-12-13 12:03:26 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-12-13 12:03:26 +0000 |
| commit | c8278a23449da36df4e7177c49dcc6fc74683306 (patch) | |
| tree | b5d787a107b3a37d7c8d1034928fb58c5557fa44 /FL | |
| parent | 64716f01e27a9c8ec28cfa9fd9e9822930a14ada (diff) | |
New patches appliet for Cocoa port. Fixed(?) STR 2232 workaround for X11 keyrepeat bbbbuuuuuuggggg.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6966 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar.H | 5 | ||||
| -rw-r--r-- | FL/mac.H | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index 40e587a8b..8c8cbfd40 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -43,8 +43,9 @@ public: fl_sys_menu_bar = this; } void menu(const Fl_Menu_Item *m); - int add(const char* label, int shortcut, Fl_Callback*, void *user_data=0, int flags=0); - void remove(int n); + 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); }; #else @@ -54,6 +54,7 @@ #ifndef MAC_OS_X_VERSION_MAX_ALLOWED #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 #endif +#endif //__APPLE_COCOA__ #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h #if defined(__LP64__) && __LP64__ @@ -61,9 +62,8 @@ typedef double CGFloat; #else typedef float CGFloat; #endif -#endif +#endif //CGFLOAT_DEFINED -#endif // Now make some fixes to the headers... #undef check // Dunno where this comes from... |