Add missing Fl_Labeltype and Fl_Boxtype definitions.

Some labeltypes and boxtypes were missing a #define for the enum
without a leading underscore and the corresponding setup function
to initialize the internal table of boxtypes and labeltypes, for
instance _FL_MULTI_LABEL. This is now fixed so (hopefully) all boxtypes
and labeltypes can and _should_ be used w/o leading underscore.

Note: if there are still boxtypes or labeltypes that can't be used w/o
leading underscore this should be considered a bug and is to be fixed ASAP.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12443 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 12 insertions, 4 deletions

diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H
index 55f953db6..dbe1a80fb 100644
--- a/FL/Fl_Menu_Item.H
+++ b/FL/Fl_Menu_Item.H
@@ -348,11 +348,19 @@ struct FL_EXPORT Fl_Menu_Item {
 
   // compatibility for FLUID so it can set the image of a menu item...
 
-  /** compatibility api for FLUID, same as a->label(this) */
-  void image(Fl_Image* a) {a->label(this);}
+  /** Compatibility API for FLUID, same as image->label(this).
 
-  /** compatibility api for FLUID, same as a.label(this) */
-  void image(Fl_Image& a) {a.label(this);}
+    \note This method is intended for internal use by fluid and may
+      not do what you expect.
+  */
+  void image(Fl_Image* image) {image->label(this);}
+
+  /** Compatibility API for FLUID, same as image.label(this).
+
+    \note This method is intended for internal use by fluid and may
+      not do what you expect.
+  */
+  void image(Fl_Image& image) {image.label(this);}
 
   // used by menubar:
   int measure(int* h, const Fl_Menu_*) const;