ui::CheckButton m_enabled;
ui::Entry m_horizontal;
ui::Entry m_vertical;
-Subdivisions() : m_enabled( (GtkCheckButton *) 0 ), m_horizontal( ui::null ), m_vertical( ui::null ){
+Subdivisions() : m_enabled( ui::null ), m_horizontal( ui::null ), m_vertical( ui::null ){
}
void update(){
PatchFixedSubdivisions subdivisions;
Patch_AutoCapTexture();
}
-static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){
+static void OnSpinChanged(ui::Adjustment adj, gpointer data ){
texdef_t td;
td.rotate = 0;
}
// update the point-by-point view
- OnSelchangeComboColRow( ui::root ,0 );
+ OnSelchangeComboColRow( ui::root, 0 );
}
static gint OnDialogKey( ui::Widget widget, GdkEventKey* event, gpointer data ){
{
auto combo = ui::ComboBoxText(ui::New);
combo.connect( "changed", G_CALLBACK( OnSelchangeComboColRow ), this );
- AddDialogData( *GTK_COMBO_BOX(combo), m_nRow );
+ AddDialogData( combo, m_nRow );
combo.show();
table.attach(combo, {0, 1, 1, 2}, {(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0)}, {0, 0});
{
auto combo = ui::ComboBoxText(ui::New);
combo.connect( "changed", G_CALLBACK( OnSelchangeComboColRow ), this );
- AddDialogData( *GTK_COMBO_BOX(combo), m_nCol );
+ AddDialogData( combo, m_nCol );
combo.show();
table.attach(combo, {1, 2, 1, 2}, {(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0)}, {0, 0});
auto entry = ui::Entry(ui::New);
entry.show();
table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
- AddDialogData( *GTK_ENTRY(entry), m_fX );
+ AddDialogData( entry, m_fX );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
auto entry = ui::Entry(ui::New);
entry.show();
table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
- AddDialogData( *GTK_ENTRY(entry), m_fY );
+ AddDialogData( entry, m_fY );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
auto entry = ui::Entry(ui::New);
entry.show();
table.attach(entry, {1, 2, 2, 3}, {GTK_EXPAND | GTK_FILL, 0});
- AddDialogData( *GTK_ENTRY(entry), m_fZ );
+ AddDialogData( entry, m_fZ );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
auto entry = ui::Entry(ui::New);
entry.show();
table.attach(entry, {1, 2, 3, 4}, {GTK_EXPAND | GTK_FILL, 0});
- AddDialogData( *GTK_ENTRY(entry), m_fS );
+ AddDialogData( entry, m_fS );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
auto entry = ui::Entry(ui::New);
entry.show();
table.attach(entry, {1, 2, 4, 5}, {GTK_EXPAND | GTK_FILL, 0});
- AddDialogData( *GTK_ENTRY(entry), m_fT );
+ AddDialogData( entry, m_fT );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
table.attach(label, {0, 1, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
}
{
- auto check = ui::CheckButton(GTK_CHECK_BUTTON( gtk_check_button_new() ));
+ auto check = ui::CheckButton::from( gtk_check_button_new() );
check.show();
table.attach(check, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
m_subdivisions.m_enabled = check;
// gtk_editable_set_editable (GTK_ENTRY (entry), false);
entry.show();
vbox2.pack_start( entry, TRUE, TRUE, 0 );
- AddDialogData( *GTK_ENTRY(entry), m_strName );
+ AddDialogData( entry, m_strName );
entry.connect( "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
}
void PatchInspector_Construct(){
- GlobalCommands_insert( "PatchInspector", FreeCaller<void(), PatchInspector_toggleShown>(), Accelerator( 'S', (GdkModifierType)GDK_SHIFT_MASK ) );
-
- GlobalPreferenceSystem().registerPreference( "PatchWnd", WindowPositionTrackerImportStringCaller( g_PatchInspector.m_position_tracker ), WindowPositionTrackerExportStringCaller( g_PatchInspector.m_position_tracker ) );
- GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale1", FloatImportStringCaller( g_pi_globals.scale[0] ), FloatExportStringCaller( g_pi_globals.scale[0] ) );
- GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale2", FloatImportStringCaller( g_pi_globals.scale[1] ), FloatExportStringCaller( g_pi_globals.scale[1] ) );
- GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift1", FloatImportStringCaller( g_pi_globals.shift[0] ), FloatExportStringCaller( g_pi_globals.shift[0] ) );
- GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift2", FloatImportStringCaller( g_pi_globals.shift[1] ), FloatExportStringCaller( g_pi_globals.shift[1] ) );
- GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Rotate", FloatImportStringCaller( g_pi_globals.rotate ), FloatExportStringCaller( g_pi_globals.rotate ) );
+ GlobalCommands_insert( "PatchInspector", makeCallbackF(PatchInspector_toggleShown), Accelerator( 'S', (GdkModifierType)GDK_SHIFT_MASK ) );
+
+ GlobalPreferenceSystem().registerPreference( "PatchWnd", make_property<WindowPositionTracker_String>( g_PatchInspector.m_position_tracker ) );
+ GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale1", make_property_string( g_pi_globals.scale[0] ) );
+ GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale2", make_property_string( g_pi_globals.scale[1] ) );
+ GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift1", make_property_string( g_pi_globals.shift[0] ) );
+ GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift2", make_property_string( g_pi_globals.shift[1] ) );
+ GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Rotate", make_property_string( g_pi_globals.rotate ) );
typedef FreeCaller<void(const Selectable&), PatchInspector_SelectionChanged> PatchInspectorSelectionChangedCaller;
GlobalSelectionSystem().addSelectionChangeCallback( PatchInspectorSelectionChangedCaller() );