From c8278a23449da36df4e7177c49dcc6fc74683306 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sun, 13 Dec 2009 12:03:26 +0000 Subject: 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 --- FL/Fl_Sys_Menu_Bar.H | 5 +++-- FL/mac.H | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'FL') 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 diff --git a/FL/mac.H b/FL/mac.H index ae35224cd..0d24d03c8 100644 --- a/FL/mac.H +++ b/FL/mac.H @@ -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... -- cgit v1.2.3