diff options
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/app/Menu.h | 2 | ||||
| -rw-r--r-- | fluid/app/Snap_Action.cxx | 4 | ||||
| -rw-r--r-- | fluid/panels/settings_panel.fl | 10 | ||||
| -rw-r--r-- | fluid/panels/settings_panel.h | 2 | ||||
| -rw-r--r-- | fluid/proj/align_widget.cxx | 3 |
5 files changed, 11 insertions, 10 deletions
diff --git a/fluid/app/Menu.h b/fluid/app/Menu.h index 43f5d7e6f..065929c04 100644 --- a/fluid/app/Menu.h +++ b/fluid/app/Menu.h @@ -23,7 +23,7 @@ extern void exit_cb(class Fl_Widget *,void *); // TODO: remove this extern void toggle_widgetbin_cb(Fl_Widget *, void *); extern void menu_file_save_cb(Fl_Widget *, void *arg); extern void menu_file_open_history_cb(Fl_Widget *, void *v); -extern void align_widget_cb(Fl_Widget *, long); +extern void align_widget_cb(Fl_Widget *, void*); #endif // FLUID_APP_MENU_H diff --git a/fluid/app/Snap_Action.cxx b/fluid/app/Snap_Action.cxx index f33054eca..d67e074cb 100644 --- a/fluid/app/Snap_Action.cxx +++ b/fluid/app/Snap_Action.cxx @@ -140,11 +140,11 @@ void select_layout_preset_cb(Fl_Widget *, void *user_data) { Fluid.layout_list.update_dialogs(); } -void edit_layout_preset_cb(Fl_Button *w, long user_data) { +void edit_layout_preset_cb(Fl_Button *w, void *user_data) { int index = (int)w->argument(); assert(index >= 0); assert(index < 3); - if (user_data == (long)(fl_intptr_t)LOAD) { + if (user_data == LOAD) { w->value(Fluid.layout_list.current_preset() == index); } else { Fluid.layout_list.current_preset(index); diff --git a/fluid/panels/settings_panel.fl b/fluid/panels/settings_panel.fl index c66f48bd2..6ea964dc2 100644 --- a/fluid/panels/settings_panel.fl +++ b/fluid/panels/settings_panel.fl @@ -198,7 +198,7 @@ Function {make_settings_window()} {open xywh {10 10 320 530} selection_color 12 labelsize 11 labelcolor 255 resizable } { Fl_Group w_settings_general_tab { - label General open + label General open selected scale_image {36 24} image {../icons/general_64.png} compress_image 1 xywh {10 60 320 480} labelsize 11 resizable } { Fl_Group {} { @@ -207,7 +207,7 @@ Function {make_settings_window()} {open } { Fl_Choice scheme_choice { label {Scheme: } - callback {Fluid.set_scheme(o->text(o->value()));} open selected + callback {Fluid.set_scheme(o->text(o->value()));} open xywh {120 78 120 25} down_box BORDER_BOX labelfont 1 labelsize 11 code0 {Fluid.init_scheme();} class Fl_Scheme_Choice @@ -602,19 +602,19 @@ Fluid.layout_list.update_dialogs();} } { Fl_Button {preset_choice[0]} { label Application - user_data 0 user_data_type long + user_data 0 callback edit_layout_preset_cb xywh {85 107 78 20} type Radio value 1 selection_color 45 labelsize 11 compact 1 } Fl_Button {preset_choice[1]} { label Dialog - user_data 1 user_data_type long + user_data 1 callback edit_layout_preset_cb xywh {163 107 79 20} type Radio selection_color 45 labelsize 11 compact 1 } Fl_Button {preset_choice[2]} { label Toolbox - user_data 2 user_data_type long + user_data 2 callback edit_layout_preset_cb xywh {242 107 78 20} type Radio selection_color 45 labelsize 11 compact 1 } diff --git a/fluid/panels/settings_panel.h b/fluid/panels/settings_panel.h index c864d23b5..69482d307 100644 --- a/fluid/panels/settings_panel.h +++ b/fluid/panels/settings_panel.h @@ -80,7 +80,7 @@ extern Fl_Choice *layout_choice; #include <FL/Fl_Menu_Button.H> extern Fl_Menu_Button *w_layout_menu; #include <FL/Fl_Native_File_Chooser.H> -extern void edit_layout_preset_cb(Fl_Button*, long); +extern void edit_layout_preset_cb(Fl_Button*, void*); extern Fl_Button *preset_choice[3]; #include <FL/Fl_Value_Input.H> extern Fl_Menu_Item fontmenu_w_default[]; diff --git a/fluid/proj/align_widget.cxx b/fluid/proj/align_widget.cxx index 9ce9e2b62..8056de429 100644 --- a/fluid/proj/align_widget.cxx +++ b/fluid/proj/align_widget.cxx @@ -31,9 +31,10 @@ #define BREAK_ON_FIRST break //#define BREAK_ON_FIRST -void align_widget_cb(Fl_Widget*, long how) +void align_widget_cb(Fl_Widget*, void *user_data) { const int max = 32768, min = -32768; + int how = (int)(fl_intptr_t)(user_data); int left, right, top, bot, wdt, hgt, n; Node *o; int changed = 0; |