mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FLUID: Add cast to avoid warning #956

Browse Source 
User Data of grid menu items was missin fl_intptr_t
This commit is contained in:
Matthias Melcher 2024-04-17 20:40:10 +02:00
parent 240d8d21df
commit 14a5187fa7
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fluid/widget_panel.cxx
View File

@ -580,18 +580,18 @@ Fl_Box *widget_grid_unlinked=(Fl_Box *)0;
Fl_Group *wp_gridc_align=(Fl_Group *)0; Fl_Group *wp_gridc_align=(Fl_Group *)0;
Fl_Menu_Item menu_Horizontal[] = { Fl_Menu_Item menu_Horizontal[] = {
{"GRID_LEFT", 0, 0, (void*)(FL_GRID_LEFT), 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_GRID_CENTER), 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_GRID_RIGHT), 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_GRID_HORIZONTAL), 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} {0,0,0,0,0,0,0,0,0}
}; };
Fl_Menu_Item menu_Vertical[] = { Fl_Menu_Item menu_Vertical[] = {
{"GRID_TOP", 0, 0, (void*)(FL_GRID_TOP), 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_GRID_CENTER), 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_GRID_BOTTOM), 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_GRID_VERTICAL), 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} {0,0,0,0,0,0,0,0,0}
}; };

18
fluid/widget_panel.fl
View File

@ -1189,24 +1189,24 @@ wCallback->do_callback(wCallback, v);} open
callback grid_align_horizontal_cb open callback grid_align_horizontal_cb open
xywh {95 100 115 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11 xywh {95 100 115 20} down_box BORDER_BOX labelsize 11 align 5 textsize 11
} { } {
MenuItem {} { MenuItem GRID_LEFT {
label 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_CENTER 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_RIGHT 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_FILL 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 xywh {10 10 31 20} labelsize 11
} }
} }
@ -1217,22 +1217,22 @@ wCallback->do_callback(wCallback, v);} open
} { } {
MenuItem {} { MenuItem {} {
label GRID_TOP 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_CENTER 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_BOTTOM 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 xywh {10 10 31 20} labelsize 11
} }
MenuItem {} { MenuItem {} {
label GRID_FILL 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 xywh {10 10 31 20} labelsize 11
} }
} }

1
fluid/widget_panel.h
View File

@ -217,5 +217,6 @@ extern Fl_Menu_Item menu_2[];
extern Fl_Menu_Item menu_3[]; extern Fl_Menu_Item menu_3[];
extern Fl_Menu_Item menu_4[]; extern Fl_Menu_Item menu_4[];
extern Fl_Menu_Item menu_Horizontal[]; extern Fl_Menu_Item menu_Horizontal[];
#define GRID_LEFT (menu_Horizontal+0)
extern Fl_Menu_Item menu_Vertical[]; extern Fl_Menu_Item menu_Vertical[];
#endif #endif