ui::Entry DialogEntry_new(){
auto entry = ui::Entry(ui::New);
entry.show();
- gtk_widget_set_size_request( entry , 64, -1 );
+ entry.dimensions(64, -1);
return entry;
}
}
auto spin = ui::SpinButton( ui::Adjustment( value, lower, upper, step, 10, 0 ), step, digits );
spin.show();
- gtk_widget_set_size_request( spin , 64, -1 );
+ spin.dimensions(64, -1);
return spin;
}
class DialogSpinnerRow
{
public:
-DialogSpinnerRow( ui::Widget row, GtkSpinButton* spin ) : m_row( row ), m_spin( spin ){
+DialogSpinnerRow( ui::Widget row, ui::SpinButton spin ) : m_row( row ), m_spin( spin ){
}
ui::Widget m_row;
ui::SpinButton m_spin;
typename Type_,
typename Other_,
void( *Import ) ( Type_&, Other_ ),
- void( *Export ) ( Type_&, const Callback1<Other_>& )
+ void( *Export ) ( Type_&, const Callback<void(Other_)>& )
>
class ImportExport
{
typedef Type_ Type;
typedef Other_ Other;
-typedef ReferenceCaller1<Type, Other, Import> ImportCaller;
-typedef ReferenceCaller1<Type, const Callback1<Other>&, Export> ExportCaller;
+typedef ReferenceCaller<Type, void(Other), Import> ImportCaller;
+typedef ReferenceCaller<Type, void(const Callback<void(Other)>&), Export> ExportCaller;
};
typedef ImportExport<bool, bool, BoolImport, BoolExport> BoolImportExport;
class CallbackDialogData : public DLG_DATA
{
public:
-typedef Callback1<FirstArgument> ImportCallback;
-typedef Callback1<const ImportCallback&> ExportCallback;
+typedef Callback<void(FirstArgument)> ImportCallback;
+typedef Callback<void(const ImportCallback&)> ExportCallback;
private:
ImportCallback m_importWidget;
}
void apply(
typename Widget::Type& widget,
- const Callback1<typename Widget::Other>& importViewer,
- const Callback1<const Callback1<typename Widget::Other>&>& exportViewer
+ const Callback<void(typename Widget::Other)>& importViewer,
+ const Callback<void(const Callback<void(typename Widget::Other)>&)>& exportViewer
) const {
m_data.push_back(
new CallbackDialogData<typename Widget::Other>(