summaryrefslogtreecommitdiff
path: root/FL
diff options
context:
space:
mode:
Diffstat (limited to 'FL')
-rw-r--r--FL/Fl_Sys_Menu_Bar.H5
-rw-r--r--FL/mac.H4
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
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...