Add Menu mvalue() and prev_mvalue()

MoAlyousef · Jul 26, 2024 · 9159391 · 9159391
1 parent 25d5b41
commit 9159391
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/fltk b/fltk
diff --git a/include/cfl_menu.h b/include/cfl_menu.h
@@ -53,7 +53,9 @@ extern "C" {
         const Fl_Menu_Item *item                                               \
     );                                                                         \
     void widget##_set_menu_box(widget *self, int b);                           \
-    int widget##_menu_box(const widget *self);
+    int widget##_menu_box(const widget *self);                                 \
+    Fl_Menu_Item *widget##_mvalue(const widget *);                             \
+    Fl_Menu_Item *widget##_prev_mvalue(const widget *);
 
 typedef struct Fl_Menu_Item Fl_Menu_Item;
 

diff --git a/src/cfl_menu.cpp b/src/cfl_menu.cpp
@@ -149,6 +149,14 @@
     int widget##_menu_box(const widget *self) {                                \
         LOCK(auto ret = self->menu_box());                                     \
         return ret;                                                            \
+    }                                                                          \
+    Fl_Menu_Item *widget##_mvalue(const widget *self) {                        \
+        LOCK(auto ret = self->mvalue());                                       \
+        return (Fl_Menu_Item *)ret;                                            \
+    }                                                                          \
+    Fl_Menu_Item *widget##_prev_mvalue(const widget *self) {                   \
+        LOCK(auto ret = self->prev_mvalue());                                  \
+        return (Fl_Menu_Item *)ret;                                            \
     }
 
 WIDGET_CLASS(Fl_Menu_Bar)
@@ -252,7 +260,11 @@ const Fl_Menu_Item *Fl_Menu_Item_pulldown(
     const Fl_Menu_Item *title,
     int menubar
 ) {
-    LOCK(auto ret = self->pulldown(X, Y, W, H, picked, (const Fl_Menu_ *)menu, title, menubar));
+    LOCK(
+        auto ret = self->pulldown(
+            X, Y, W, H, picked, (const Fl_Menu_ *)menu, title, menubar
+        )
+    );
     return ret;
 }
 
@@ -365,7 +377,8 @@ void Fl_Menu_Item_set_callback(Fl_Menu_Item *self, Fl_Callback *c, void *p) {
 }
 
 void Fl_Menu_Item_do_callback(Fl_Menu_Item *self, Fl_Widget *w) {
-    LOCK(if (self->callback() && ((Fl_Menu_*)w)->find_index(self) >= 0) self->do_callback(w));
+    LOCK(if (self->callback() && ((Fl_Menu_ *)w)->find_index(self) >= 0)
+             self->do_callback(w));
 }
 
 void *Fl_Menu_Item_user_data(const Fl_Menu_Item *self) {
+1 −0		FL/Fl_Graphics_Driver.H
+3 −0		FL/Fl_Tile.H
+1 −0		src/Fl_Device.cxx
+8 −4		src/Fl_Graphics_Driver.cxx
+4 −0		src/Fl_Tile.cxx
+2 −0		src/Fl_Window_Driver.H
+1 −0		src/drivers/GDI/Fl_GDI_Graphics_Driver.H
+8 −0		src/drivers/GDI/Fl_GDI_Graphics_Driver_rect.cxx
+2 −2		src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx
+1 −0		src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H
+4 −0		src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx