diff options
Diffstat (limited to 'fluid/panels')
| -rw-r--r-- | fluid/panels/widget_panel.cxx | 20 | ||||
| -rw-r--r-- | fluid/panels/widget_panel.fl | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/fluid/panels/widget_panel.cxx b/fluid/panels/widget_panel.cxx index f9365ae63..86bff8e62 100644 --- a/fluid/panels/widget_panel.cxx +++ b/fluid/panels/widget_panel.cxx @@ -1063,13 +1063,13 @@ static void cb_wp_gui_margins(Fl_Group* o, void* v) { } static void cb_Left(Fl_Value_Input* o, void* v) { - flex_margin_cb(o, v, + flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; w->margin(&v, nullptr, nullptr, nullptr); i->value((double)v); - }, + }, [](Fl_Flex *w, int new_value) -> int { int l, t, r, b; @@ -1107,7 +1107,7 @@ static void cb_Top(Fl_Value_Input* o, void* v) { } static void cb_Right(Fl_Value_Input* o, void* v) { - flex_margin_cb(o, v, + flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; @@ -1129,7 +1129,7 @@ static void cb_Right(Fl_Value_Input* o, void* v) { } static void cb_Bottom(Fl_Value_Input* o, void* v) { - flex_margin_cb(o, v, + flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; @@ -1151,12 +1151,12 @@ static void cb_Bottom(Fl_Value_Input* o, void* v) { } static void cb_Gap(Fl_Value_Input* o, void* v) { - flex_margin_cb(o, v, + flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* o) -> void { int v = w->gap(); o->value((double)v); - }, + }, [](Fl_Flex *w, int new_value) -> int { int g = w->gap(); @@ -1575,8 +1575,8 @@ static void cb_6(Fl_Menu_Button* o, void* v) { if (d == c) return; c = d; labelcolor_common(c); - w_labelcolor->color(c); - w_labelcolor->labelcolor(fl_contrast(FL_BLACK,c)); + w_labelcolor->color(c); + w_labelcolor->labelcolor(fl_contrast(FL_BLACK,c)); w_labelcolor->redraw(); } } @@ -1586,7 +1586,7 @@ Fl_Group *wp_style_box=(Fl_Group *)0; static void cb_7(Fl_Choice* o, void* v) { if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate(); - int n = current_widget->o->box(); + int n = current_widget->o->box(); if (!n) n = ZERO_ENTRY; for (int j = 0; j < 72 /*int(sizeof(boxmenu)/sizeof(*boxmenu))*/; j++) if (boxmenu[j].argument() == n) {o->value(j); break;} @@ -1927,7 +1927,7 @@ Fl_Group *wp_cpp_class=(Fl_Group *)0; static void cb_e(Fl_Input* o, void* v) { if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) { - o->deactivate(); + o->deactivate(); } else { o->activate(); o->value(current_widget->subclass()); diff --git a/fluid/panels/widget_panel.fl b/fluid/panels/widget_panel.fl index d479b0bef..b120ec28f 100644 --- a/fluid/panels/widget_panel.fl +++ b/fluid/panels/widget_panel.fl @@ -1204,13 +1204,13 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11 } { Fl_Value_Input {} { label {Left:} - callback {flex_margin_cb(o, v, + callback {flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; w->margin(&v, nullptr, nullptr, nullptr); i->value((double)v); - }, + }, [](Fl_Flex *w, int new_value) -> int { int l, t, r, b; @@ -1250,7 +1250,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11 } Fl_Value_Input {} { label {Right:} - callback {flex_margin_cb(o, v, + callback {flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; @@ -1273,7 +1273,7 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11 } Fl_Value_Input {} { label {Bottom:} - callback {flex_margin_cb(o, v, + callback {flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* i) -> void { int v; @@ -1296,12 +1296,12 @@ h, ph, sh, ch, and i} xywh {275 150 55 20} labelsize 11 align 5 textsize 11 } Fl_Value_Input {} { label {Gap:} - callback {flex_margin_cb(o, v, + callback {flex_margin_cb(o, v, [](Fl_Flex *w, Fl_Value_Input* o) -> void { int v = w->gap(); o->value((double)v); - }, + }, [](Fl_Flex *w, int new_value) -> int { int g = w->gap(); @@ -1769,8 +1769,8 @@ if (v != LOAD) { if (d == c) return; c = d; labelcolor_common(c); - w_labelcolor->color(c); - w_labelcolor->labelcolor(fl_contrast(FL_BLACK,c)); + w_labelcolor->color(c); + w_labelcolor->labelcolor(fl_contrast(FL_BLACK,c)); w_labelcolor->redraw(); }} open xywh {386 40 18 20} @@ -1786,7 +1786,7 @@ if (v != LOAD) { Fl_Choice {} { callback {if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) {o->deactivate(); return;} else o->activate(); - int n = current_widget->o->box(); + int n = current_widget->o->box(); if (!n) n = ZERO_ENTRY; for (int j = 0; j < 72 /*int(sizeof(boxmenu)/sizeof(*boxmenu))*/; j++) if (boxmenu[j].argument() == n) {o->value(j); break;} @@ -2169,7 +2169,7 @@ if (v == LOAD) { user_data 4 callback {if (v == LOAD) { if (current_widget->is_a(Type::Menu_Item)) { - o->deactivate(); + o->deactivate(); } else { o->activate(); o->value(current_widget->subclass()); |
