diff options
| author | Greg Ercolano <erco@seriss.com> | 2016-07-19 23:50:09 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2016-07-19 23:50:09 +0000 |
| commit | f375b6098f48935ed9de785646b5f28fe21a8aab (patch) | |
| tree | 9b18c913ef94274c68ef73b77d511c0d22af9c02 /FL | |
| parent | 4f9345b40ab4e8c772460cb0d7a0a6475fa731d1 (diff) | |
Bringing over fix [r11786] from 1.3 current to the porting branch.
Some small Fl_Sys_Menu_Bar related doc mods as per STR#3317.
WIP -- more to come; just checking in what I have for now..
1) rank -> index
2) Added docs for index \return values for some methods
3) Some clarification in the internal docs about rank vs. index
4) Enabled Fl_Menu_Item's enum flags to be able to be links (added @file
to Fl_Menu_Item.H) so references to e.g. "::FL_MENU_TOGGLE" will show
up as links in doxygen docs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11825 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Menu_Item.H | 3 | ||||
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar.H | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index ebff23ae2..55f953db6 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -23,6 +23,9 @@ # include "Fl_Image.H" # include <FL/platform_types.h> // for FL_COMMAND and FL_CONTROL +// doxygen needs the following line to enable e.g. ::FL_MENU_TOGGLE to link to the enums +/// @file + enum { // values for flags: FL_MENU_INACTIVE = 1, ///< Deactivate menu item (gray out) FL_MENU_TOGGLE= 2, ///< Item is a checkbox toggle (shows checkbox for on/off state) diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index c866c083d..61d97fe52 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -70,7 +70,7 @@ public: return insert(index, label, fl_old_shortcut(shortcut), cb, user_data, flags); } void remove(int n); - void replace(int rank, const char *name); + void replace(int index, const char *name); /** Set the Fl_Menu_Item array pointer to null, indicating a zero-length menu. \see Fl_Menu_::clear() */ |