index 33193bbba24301cd9216643f1dab8884a3a1849f..9bf2d761d2c9eb9278079365c17c7aa8012fe010 100644 (file)
//========================================================================
/**
- * Helper function that attachs widgets in a 3xn table. The widgets come in an
+ * Helper function that attaches widgets in a 3xn table. The widgets come in an
* array that has two entries per table row. The two entries code for four
* possible cases: (0,0) means insert space in first column; (0, non-0) means
* widget in columns 2-3; (non-0, 0) means label in columns 1-3; and
* (non-0, non-0) means two widgets in columns 2 and 3.
**/
inline void
-attach_all (Gtk::Table &table, const Gtk::Widget *arr[], unsigned size, int start = 0)
+attach_all(Gtk::Table &table, Gtk::Widget *const arr[], unsigned const n, int start = 0)
{
- for (unsigned i=0, r=start; i<size/sizeof(Gtk::Widget*); i+=2)
+ for (unsigned i = 0, r = start; i < n; i += 2)
{
if (arr[i] && arr[i+1])
{
- table.attach (const_cast<Gtk::Widget&>(*arr[i]), 1, 2, r, r+1,
+ table.attach(*arr[i], 1, 2, r, r+1,
Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
- table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1,
+ table.attach(*arr[i+1], 2, 3, r, r+1,
Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
}
else
{
if (arr[i+1])
- table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1,
+ table.attach(*arr[i+1], 1, 3, r, r+1,
Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
else if (arr[i])
{
- Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i]));
+ Gtk::Label& label = reinterpret_cast<Gtk::Label&>(*arr[i]);
label.set_alignment (0.0);
table.attach (label, 0, 3, r, r+1,
Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
label_for->set_markup (_("<b>Format</b>"));
_page_sizer.init (_wr);
- const Gtk::Widget* widget_array[] =
+ Gtk::Widget *const widget_array[] =
{
label_gen, 0,
_rum_deflt._label, _rum_deflt._sel,
_rcp_bord._label, _rcp_bord._cp,
};
- attach_all (_page_page.table(), widget_array, sizeof(widget_array));
+ attach_all(_page_page.table(), widget_array, G_N_ELEMENTS(widget_array));
}
void
Gtk::Label *label_gui = manage (new Gtk::Label);
label_gui->set_markup (_("<b>Guides</b>"));
- const Gtk::Widget* widget_array[] =
+ Gtk::Widget *const widget_array[] =
{
label_gui, 0,
0, _rcb_sgui._button,
_rcp_hgui._label, _rcp_hgui._cp,
};
- attach_all (_page_guides.table(), widget_array, sizeof(widget_array));
+ attach_all(_page_guides.table(), widget_array, G_N_ELEMENTS(widget_array));
}
void
Gtk::Label *label_gu = manage (new Gtk::Label);
label_gu->set_markup (_("<b>Guide Snapping</b>"));
- const Gtk::Widget* array[] =
+ Gtk::Widget *const array[] =
{
label_o, 0,
0, _rcbsnop._button,
0, _rsu_gusn._vbox,
};
- attach_all (_page_snap.table(), array, sizeof(array));
+ attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
}
/**
_grids_notebook.append_page(grid->getWidget(), grid->repr->attribute("id"));
}
- const Gtk::Widget* widget_array[] =
+ Gtk::Widget *const widget_array[] =
{
label_crea, 0,
label_crea_type, (Gtk::Widget*) &_grids_combo_gridtype,
(Gtk::Widget*) &_grids_button_new, (Gtk::Widget*) &_grids_button_remove,
- label_def, 0,
- (Gtk::Widget*) &_grids_notebook, 0
+ label_def, 0
};
-
- attach_all (_page_grids.table(), widget_array, sizeof(widget_array));
+ attach_all(_page_grids.table(), widget_array, G_N_ELEMENTS(widget_array));
+ _page_grids.table().attach(_grids_notebook, 0, 3, 4, 5,
+ Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
}