diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-12-23 18:51:43 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-12-23 20:08:18 +0100 |
| commit | 1d73c0195c8bf256f23b58d0288d1bb9eb87448d (patch) | |
| tree | b0d9179cb990fb1cf6d9e325dab65d3a17f5db6a /src/Fl_Multi_Label.cxx | |
| parent | 016c36c917de79383fb2d81c267faa0829147bdf (diff) | |
Improve docs and add two new Fl_Menu_Item methods (#875)
This addresses some issues pointed out by GitHub Issue #875.
Documentation lacked details about Fl_Multi_Label assignment and
correct memory handling.
The new methods
- Fl_Menu_Item::image_label(const Fl_Image *) and
- Fl_Menu_Item::multi_label(const Fl_Multi_Label *)
provide a cleaner interface to assign images and Fl_Multi_Label's
to menu items.
examples/howto-menu-with-images.cxx: carify some issues, fix leak,
and use new Fl_Menu_Item::multi_label(const Fl_Multi_Label *).
Diffstat (limited to 'src/Fl_Multi_Label.cxx')
| -rw-r--r-- | src/Fl_Multi_Label.cxx | 55 |
1 files changed, 54 insertions, 1 deletions
diff --git a/src/Fl_Multi_Label.cxx b/src/Fl_Multi_Label.cxx index 72074bc12..29bbcfe61 100644 --- a/src/Fl_Multi_Label.cxx +++ b/src/Fl_Multi_Label.cxx @@ -1,7 +1,7 @@ // // Multi-label widget for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2017 by Bill Spitzak and others. +// Copyright 1998-2023 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -60,10 +60,63 @@ Fl_Labeltype fl_define_FL_MULTI_LABEL() { return _FL_MULTI_LABEL; } +/** + Associate an Fl_Multi_Label with an Fl_Widget. + + This method uses Fl_Widget::label(Fl_Labeltype, const char *) internally + to set the \e label of the widget, i.e. it stores a \e pointer to the + Fl_Multi_Label object (\e this). + An existing label that has been set using Fl_Widget::copy_label() will be + released prior to the assignment of the new label. + + This sets the type of the widget's label to \_FL_MULTI_LABEL - note the + leading underscore ('_'). + + There is no way to use a method like Fl_Widget::copy_label() that transfers + ownership of the Fl_Multi_Label and its linked objects (images, text, and + chained Fl_Multi_Label's) to the widget. + + The Fl_Multi_Label and all linked images, text labels, or chained Fl_Multi_Label + objects must exist during the lifetime of the widget and will not be released + when the widget is destroyed. + + \note The user's code is responsible for releasing the Fl_Multi_Label and + all linked objects (images, text, chained Fl_Multi_Label's) after the + widget has been deleted. This may cause memory leaks if Fl_Multi_Label + is used and reassigned w/o releasing the objects assigned to it. +*/ void Fl_Multi_Label::label(Fl_Widget* o) { o->label(FL_MULTI_LABEL, (const char*)this); // calls fl_define_FL_MULTI_LABEL() } +/** + Associate an Fl_Multi_Label with an Fl_Menu_Item. + + This uses Fl_Menu_Item::label(Fl_Labeltype a, const char *b) internally to + set the \e label and the label type of the menu item, i.e. it stores a + \e pointer to the Fl_Multi_Label object (\e this). + An existing label (pointer) will be overwritten. + + This sets the type of the menu item's label to \_FL_MULTI_LABEL - note the + leading underscore ('_'). + + There is no way to use a method like Fl_Widget::copy_label() that transfers + ownership of the Fl_Multi_Label and its linked objects (images, text, and + chained Fl_Multi_Label's) to the menu item. + + The Fl_Multi_Label and all linked images, text labels, or chained + Fl_Multi_Label objects must exist during the lifetime of the menu and + will not be released when the menu item is destroyed. + + \note The user's code is responsible for releasing the Fl_Multi_Label and + all linked objects (images, text, chained Fl_Multi_Label's) after the + menu has been deleted. This may cause memory leaks if Fl_Multi_Label + is used and reassigned w/o releasing the objects assigned to it. + + \deprecated since 1.4.0: please use Fl_Menu_Item::label(Fl_Multi_Label *) + + \see Fl_Menu_Item::label(Fl_Multi_Label *) +*/ void Fl_Multi_Label::label(Fl_Menu_Item* o) { o->label(FL_MULTI_LABEL, (const char*)this); // calls fl_define_FL_MULTI_LABEL() } |
