diff options
| -rw-r--r-- | FL/Enumerations.H | 3 | ||||
| -rw-r--r-- | documentation/src/events.dox | 5 | ||||
| -rw-r--r-- | documentation/src/subclassing.dox | 2 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index d45787e8f..92cfac612 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -107,7 +107,8 @@ is ok to look at it outside of the handle() method. Event numbers can be converted to their actual names using the - \ref fl_eventnames[] array defined in \#include <FL/names.h> + fl_eventnames[] array (std::map since FLTK 1.5) defined + in \#include <FL/names.h> \see Fl::event_text(), Fl::event_key(), class Fl:: */ diff --git a/documentation/src/events.dox b/documentation/src/events.dox index af0b381dc..53b4e9953 100644 --- a/documentation/src/events.dox +++ b/documentation/src/events.dox @@ -25,8 +25,9 @@ of the \p handle() method, for instance in a callback. -Event numbers can be converted to their actual names using the \ref fl_eventnames[] array -defined in \#include <FL/names.h>; see next chapter for details. +Event numbers can be converted to their actual names using the fl_eventnames[] +array (std::map since FLTK 1.5) defined in +\#include <FL/names.h>; see next chapter for details. In the next chapter, the \ref subclassing_events "MyClass::handle()" diff --git a/documentation/src/subclassing.dox b/documentation/src/subclassing.dox index 384e510f6..1782bc5b7 100644 --- a/documentation/src/subclassing.dox +++ b/documentation/src/subclassing.dox @@ -298,7 +298,7 @@ uses the event. If you return zero, the parent widget will try sending the event to another widget. For debugging purposes, event numbers can be printed as their actual event names -using the \ref fl_eventnames[] array, e.g.: +using the fl_eventnames[] array (std::map since FLTK 1.5), e.g.: \code #include <FL/names.h> // defines fl_eventnames[] [..] diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 36c191e56..5de7b1bc1 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1644,8 +1644,8 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { /** The Fl_Window from which currently displayed popups originate. Optionally, gives also the height of the display containing this window. - \parmm[out]display_height return the height of the display here. - \return pointe to the owning window + \param[out] display_height return the height of the display here. + \return pointer to the owning window */ Fl_Window *Fl_Window_Driver::menu_parent(int *display_height) { if (display_height) *display_height = Menu_Window::display_height_; |