diff options
| author | maxim nikonov <maxim.nikonov@hqo.co> | 2026-02-06 02:33:41 +0500 |
|---|---|---|
| committer | maxim nikonov <maxim.nikonov@hqo.co> | 2026-02-06 02:33:41 +0500 |
| commit | 43e0a37906afabb0b3b091b8d3eac9a910cae50c (patch) | |
| tree | d2a037c2bf0dc395fddb08e32ebfcf2795503b7c /fluid/panels/widget_panel | |
| parent | 4ce4967c33d56e4b56d85d11fe0e0be91e159f5d (diff) | |
wip
Diffstat (limited to 'fluid/panels/widget_panel')
| -rw-r--r-- | fluid/panels/widget_panel/Grid_Child_Tab.cxx | 6 | ||||
| -rw-r--r-- | fluid/panels/widget_panel/Grid_Tab.cxx | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/fluid/panels/widget_panel/Grid_Child_Tab.cxx b/fluid/panels/widget_panel/Grid_Child_Tab.cxx index d39f46477..674b17bd7 100644 --- a/fluid/panels/widget_panel/Grid_Child_Tab.cxx +++ b/fluid/panels/widget_panel/Grid_Child_Tab.cxx @@ -485,8 +485,8 @@ void Grid_Child_Tab::grid_child_cb(fld::widget::Formula_Input* i, void* v, int w case 9: v = cell->col(); break; case 10: v = cell->rowspan(); break; case 11: v = cell->colspan(); break; - case 12: cell->minimum_size(&v, nullptr); break; - case 13: cell->minimum_size(nullptr, &v); break; + case 12: cell->minimum_size(&v, 0); break; + case 13: cell->minimum_size(0, &v); break; } } i->value(v); @@ -495,7 +495,7 @@ void Grid_Child_Tab::grid_child_cb(fld::widget::Formula_Input* i, void* v, int w int v2 = -2, old_v = -2, v = i->value(); if (i==widget_grid_row_input) v2 = widget_grid_col_input->value(); if (i==widget_grid_col_input) v2 = widget_grid_row_input->value(); - Fl_Grid::Cell *new_cell = nullptr; + Fl_Grid::Cell *new_cell = 0; if (cell) { switch (what & 0x00ff) { case 8: old_v = cell->row(); v2 = cell->col(); break; diff --git a/fluid/panels/widget_panel/Grid_Tab.cxx b/fluid/panels/widget_panel/Grid_Tab.cxx index 756d957ac..4730f0789 100644 --- a/fluid/panels/widget_panel/Grid_Tab.cxx +++ b/fluid/panels/widget_panel/Grid_Tab.cxx @@ -109,11 +109,11 @@ void Grid_Tab::cb_Left_i(Fl_Value_Input* o, void* v) { if (!grid) return; int m = 0; if (v == LOAD) { - grid->margin(&m, nullptr, nullptr, nullptr); + grid->margin(&m, 0, 0, 0); o->value(m); } else { int m = (int)o->value(), old_m; - grid->margin(&old_m, nullptr, nullptr, nullptr); + grid->margin(&old_m, 0, 0, 0); if (m != old_m) { Fluid.proj.undo.checkpoint(); grid->margin(m, -1, -1, -1); @@ -131,11 +131,11 @@ void Grid_Tab::cb_Top_i(Fl_Value_Input* o, void* v) { if (!grid) return; int m = 0; if (v == LOAD) { - grid->margin(nullptr, &m, nullptr, nullptr); + grid->margin(0, &m, 0, 0); o->value(m); } else { int m = (int)o->value(), old_m; - grid->margin(nullptr, &old_m, nullptr, nullptr); + grid->margin(0, &old_m, 0, 0); if (m != old_m) { Fluid.proj.undo.checkpoint(); grid->margin(-1, m, -1, -1); @@ -153,11 +153,11 @@ void Grid_Tab::cb_Right_i(Fl_Value_Input* o, void* v) { if (!grid) return; int m = 0; if (v == LOAD) { - grid->margin(nullptr, nullptr, &m, nullptr); + grid->margin(0, 0, &m, 0); o->value(m); } else { int m = (int)o->value(), old_m; - grid->margin(nullptr, nullptr, &old_m, nullptr); + grid->margin(0, 0, &old_m, 0); if (m != old_m) { Fluid.proj.undo.checkpoint(); grid->margin(-1, -1, m, -1); @@ -175,11 +175,11 @@ void Grid_Tab::cb_Bottom_i(Fl_Value_Input* o, void* v) { if (!grid) return; int m = 0; if (v == LOAD) { - grid->margin(nullptr, nullptr, nullptr, &m); + grid->margin(0, 0, 0, &m); o->value(m); } else { int m = (int)o->value(), old_m; - grid->margin(nullptr, nullptr, nullptr, &old_m); + grid->margin(0, 0, 0, &old_m); if (m != old_m) { Fluid.proj.undo.checkpoint(); grid->margin(-1, -1, -1, m); @@ -197,7 +197,7 @@ void Grid_Tab::cb_Row_i(Fl_Value_Input* o, void* v) { if (!grid) return; if (v == LOAD) { int m = 0; - grid->gap(&m, nullptr); + grid->gap(&m, 0); o->value(m); } else { int m = (int)o->value(), old_m, m2; @@ -219,7 +219,7 @@ void Grid_Tab::cb_Col_i(Fl_Value_Input* o, void* v) { if (!grid) return; if (v == LOAD) { int m = 0; - grid->gap(nullptr, &m); + grid->gap(0, &m); o->value(m); } else { int m = (int)o->value(), old_m, m2; |
