commit 14a5187fa727e80a205e3c4fc84c892cc5c3e6e9
Author:     Matthias Melcher <github@matthiasm.com>
AuthorDate: Wed Apr 17 20:40:10 2024 +0200
Commit:     Matthias Melcher <github@matthiasm.com>
CommitDate: Wed Apr 17 20:40:10 2024 +0200

    FLUID: Add cast to avoid warning #956
    
    User Data of grid menu items was missin fl_intptr_t

 fluid/widget_panel.cxx | 16 ++++++++--------
 fluid/widget_panel.fl  | 18 +++++++++---------
 fluid/widget_panel.h   |  1 +
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git fluid/widget_panel.cxx fluid/widget_panel.cxx
index cb08f13..9196614 100644
--- fluid/widget_panel.cxx
+++ fluid/widget_panel.cxx
@@ -580,18 +580,18 @@ Fl_Box *widget_grid_unlinked=(Fl_Box *)0;
 Fl_Group *wp_gridc_align=(Fl_Group *)0;
 
 Fl_Menu_Item menu_Horizontal[] = {
- {"GRID_LEFT", 0,  0, (void*)(FL_GRID_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_CENTER", 0,  0, (void*)(FL_GRID_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_RIGHT", 0,  0, (void*)(FL_GRID_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_FILL", 0,  0, (void*)(FL_GRID_HORIZONTAL), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_LEFT", 0,  0, (void*)((fl_intptr_t)FL_GRID_LEFT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_CENTER", 0,  0, (void*)((fl_intptr_t)FL_GRID_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_RIGHT", 0,  0, (void*)((fl_intptr_t)FL_GRID_RIGHT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_FILL", 0,  0, (void*)((fl_intptr_t)FL_GRID_HORIZONTAL), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
 Fl_Menu_Item menu_Vertical[] = {
- {"GRID_TOP", 0,  0, (void*)(FL_GRID_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_CENTER", 0,  0, (void*)(FL_GRID_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_BOTTOM", 0,  0, (void*)(FL_GRID_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"GRID_FILL", 0,  0, (void*)(FL_GRID_VERTICAL), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_TOP", 0,  0, (void*)((fl_intptr_t)FL_GRID_TOP), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_CENTER", 0,  0, (void*)((fl_intptr_t)FL_GRID_CENTER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_BOTTOM", 0,  0, (void*)((fl_intptr_t)FL_GRID_BOTTOM), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"GRID_FILL", 0,  0, (void*)((fl_intptr_t)FL_GRID_VERTICAL), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
diff --git fluid/widget_panel.fl fluid/widget_panel.fl
index b6ee299..02fbf3a 100644
--- fluid/widget_panel.fl
+++ fluid/widget_panel.fl
@@ -1189,24 +1189,24 @@ wCallback->do_callback(wCallback, v);} open
             callback grid_align_horizontal_cb open
             xywh {95 100 115 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
           } {
-            MenuItem {} {
+            MenuItem GRID_LEFT {
               label GRID_LEFT
-              user_data FL_GRID_LEFT user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_LEFT} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_CENTER
-              user_data FL_GRID_CENTER user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_CENTER} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_RIGHT
-              user_data FL_GRID_RIGHT user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_RIGHT} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_FILL
-              user_data FL_GRID_HORIZONTAL user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_HORIZONTAL} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
           }
@@ -1217,22 +1217,22 @@ wCallback->do_callback(wCallback, v);} open
           } {
             MenuItem {} {
               label GRID_TOP
-              user_data FL_GRID_TOP user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_TOP} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_CENTER
-              user_data FL_GRID_CENTER user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_CENTER} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_BOTTOM
-              user_data FL_GRID_BOTTOM user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_BOTTOM} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
             MenuItem {} {
               label GRID_FILL
-              user_data FL_GRID_VERTICAL user_data_type long
+              user_data {(fl_intptr_t)FL_GRID_VERTICAL} user_data_type long
               xywh {10 10 31 20} labelsize 11
             }
           }
diff --git fluid/widget_panel.h fluid/widget_panel.h
index 38a2599..14f11ab 100644
--- fluid/widget_panel.h
+++ fluid/widget_panel.h
@@ -217,5 +217,6 @@ extern Fl_Menu_Item menu_2[];
 extern Fl_Menu_Item menu_3[];
 extern Fl_Menu_Item menu_4[];
 extern Fl_Menu_Item menu_Horizontal[];
+#define GRID_LEFT (menu_Horizontal+0)
 extern Fl_Menu_Item menu_Vertical[];
 #endif