return hbox;
}
-ui::Frame create_dialog_frame( const char* label, GtkShadowType shadow ){
+ui::Frame create_dialog_frame( const char* label, ui::Shadow shadow ){
auto frame = ui::Frame( label );
frame.show();
- gtk_frame_set_shadow_type( frame, shadow );
+ gtk_frame_set_shadow_type( frame, (GtkShadowType) shadow );
return frame;
}
auto button = ui::Button( label );
gtk_widget_set_size_request( GTK_WIDGET( button ), 64, -1 );
button.show();
- g_signal_connect( G_OBJECT( button ), "clicked", func, data );
+ button.connect( "clicked", func, data );
return button;
}
ui::Window window = create_floating_window( title, parent );
gtk_window_set_default_size( window, default_w, default_h );
gtk_window_set_position( window, GTK_WIN_POS_CENTER_ON_PARENT );
- g_signal_connect( G_OBJECT( window ), "delete_event", func, data );
+ window.connect( "delete_event", func, data );
return window;
}
}
ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, ui::Widget contents ){
- ui::Window window = create_fixedsize_modal_dialog_window(ui::Window(), title, dialog );
+ ui::Window window = create_fixedsize_modal_dialog_window(ui::Window{ui::null}, title, dialog );
- GtkVBox* vbox1 = create_dialog_vbox( 8, 4 );
- gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( vbox1 ) );
+ auto vbox1 = create_dialog_vbox( 8, 4 );
+ window.add(vbox1);
- gtk_container_add( GTK_CONTAINER( vbox1 ), contents );
+ vbox1.add(contents);
ui::Alignment alignment = ui::Alignment( 0.5, 0.0, 0.0, 0.0 );
gtk_widget_show( GTK_WIDGET( alignment ) );
gtk_box_pack_start( GTK_BOX( vbox1 ), GTK_WIDGET( alignment ), FALSE, FALSE, 0 );
- GtkButton* button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
- gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( button ) );
+ auto button = create_dialog_button( "OK", G_CALLBACK( dialog_button_ok ), &dialog );
+ alignment.add(button);
return window;
}
RadioHBox RadioHBox_new( StringArrayRange names ){
- GtkHBox* hbox = ui::HBox( TRUE, 4 );
+ auto hbox = ui::HBox( TRUE, 4 );
gtk_widget_show( GTK_WIDGET( hbox ) );
GSList* group = 0;
- GtkRadioButton* radio = 0;
+ auto radio = ui::RadioButton{nullptr};
for ( StringArrayRange::Iterator i = names.first; i != names.last; ++i )
{
- radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) );
+ radio = ui::RadioButton(GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( group, *i ) ));
gtk_widget_show( GTK_WIDGET( radio ) );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( radio ), FALSE, FALSE, 0 );
PathEntry PathEntry_new(){
- GtkFrame* frame = ui::Frame();
- gtk_widget_show( GTK_WIDGET( frame ) );
+ auto frame = ui::Frame();
+ frame.show();
gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
// path entry
- GtkHBox* hbox = ui::HBox( FALSE, 0 );
+ auto hbox = ui::HBox( FALSE, 0 );
gtk_widget_show( GTK_WIDGET( hbox ) );
- GtkEntry* entry = ui::Entry();
+ auto entry = ui::Entry();
gtk_entry_set_has_frame( entry, FALSE );
gtk_widget_show( GTK_WIDGET( entry ) );
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( entry ), TRUE, TRUE, 0 );
gtk_widget_show( GTK_WIDGET( button ) );
gtk_box_pack_end( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
- gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( hbox ) );
+ frame.add(hbox);
return PathEntry( frame, entry, button );
}
BrowsedPathEntry::BrowsedPathEntry( const BrowseCallback& browse ) :
m_entry( PathEntry_new() ),
m_browse( browse ){
- g_signal_connect( G_OBJECT( m_entry.m_button ), "clicked", G_CALLBACK( BrowsedPathEntry_clicked ), this );
+ m_entry.m_button.connect( "clicked", G_CALLBACK( BrowsedPathEntry_clicked ), this );
}