diff options
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar.H | 7 | ||||
| -rw-r--r-- | FL/mac.H | 7 | ||||
| -rw-r--r-- | documentation/src/osissues.dox | 2 | ||||
| -rw-r--r-- | src/Fl_MacOS_Sys_Menu_Bar.mm | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index d89cc2d61..551ebc387 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -104,13 +104,6 @@ public: extern Fl_Sys_Menu_Bar *fl_sys_menu_bar; -/** - * Attaches a callback to the "About myprog" item of the system application menu. - For back-compatibility. Equivalent to Fl_Sys_Menu_Bar::about(cb, user_data). - */ -inline void fl_mac_set_about(Fl_Callback *cb, void *user_data, int shortcut = 0) { Fl_Sys_Menu_Bar::about(cb, user_data);} - - #endif // Fl_Sys_Menu_Bar_H // @@ -113,6 +113,13 @@ extern CGContextRef fl_gc; \sa \ref osissues_macos @{ */ +/** + * Attaches a callback to the "About myprog" item of the system application menu. + For back-compatibility. + Equivalent to Fl_Sys_Menu_Bar::about(Fl_Callback *cb, void *user_data). + */ +void fl_mac_set_about(Fl_Callback *cb, void *user_data, int shortcut = 0); + /** \brief The version number of the running Mac OS X (e.g., 100604 for 10.6.4) */ diff --git a/documentation/src/osissues.dox b/documentation/src/osissues.dox index 5c187155c..790899765 100644 --- a/documentation/src/osissues.dox +++ b/documentation/src/osissues.dox @@ -780,6 +780,8 @@ void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut) \par Attaches the callback \c cb to the "About myprog" item of the system application menu. \c cb will be called with NULL first argument and \c user_data second argument. +This MacOS-specific function is deprecated in FLTK 1.4 and replaced by +Fl_Sys_Menu_Bar::about(Fl_Callback *cb, void *data) which is cross-platform. Fl_Sys_Menu_Bar class diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index 0b6cb1896..a73caa3b1 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -665,6 +665,10 @@ void Fl_MacOS_Sys_Menu_Bar_Driver::rename_window(Fl_Window *win) } } +void fl_mac_set_about(Fl_Callback *cb, void *user_data, int shortcut) { + Fl_Sys_Menu_Bar::about(cb, user_data); +} + #endif /* __APPLE__ */ // |