#define GLADE_HOOKUP_OBJECT( component,widget,name ) \
g_object_set_data_full( G_OBJECT( component ), name, \
- gtk_widget_ref( widget ), (GDestroyNotify) gtk_widget_unref )
+ g_object_ref( (void *) widget ), (GDestroyNotify) g_object_unref )
#define GLADE_HOOKUP_OBJECT_NO_REF( component,widget,name ) \
- g_object_set_data( G_OBJECT( component ), name, widget )
+ g_object_set_data( G_OBJECT( component ), name, (void *) widget )
// created by glade
GtkWidget*
create_w_plugplug2( void ){
- GtkWidget *w_plugplug2;
- GtkWidget *vbox1;
GtkWidget *hbox2;
GtkWidget *vbox4;
GtkWidget *r_collapse;
GtkWidget *r_collapsebymaterial;
GtkWidget *r_nocollapse;
GtkWidget *vbox3;
- GtkWidget *b_export;
- GtkWidget *b_close;
GtkWidget *vbox2;
GtkWidget *label1;
- GtkWidget *scrolledwindow1;
- GtkWidget *t_materialist;
GtkWidget *ed_materialname;
GtkWidget *hbox1;
- GtkWidget *b_addmaterial;
- GtkWidget *b_removematerial;
- GtkWidget *t_exportmaterials;
GtkWidget *t_limitmatnames;
GtkWidget *t_objects;
- GtkTooltips *tooltips;
- tooltips = gtk_tooltips_new();
-
- w_plugplug2 = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+ auto w_plugplug2 = ui::Window( ui::window_type::TOP );
gtk_widget_set_name( w_plugplug2, "w_plugplug2" );
gtk_window_set_title( GTK_WINDOW( w_plugplug2 ), "BrushExport-Plugin 3.0 by namespace" );
gtk_window_set_position( GTK_WINDOW( w_plugplug2 ), GTK_WIN_POS_CENTER );
gtk_window_set_destroy_with_parent( GTK_WINDOW( w_plugplug2 ), TRUE );
- vbox1 = gtk_vbox_new( FALSE, 0 );
+ auto vbox1 = ui::VBox( FALSE, 0 );
gtk_widget_set_name( vbox1, "vbox1" );
gtk_widget_show( vbox1 );
- gtk_container_add( GTK_CONTAINER( w_plugplug2 ), vbox1 );
+ w_plugplug2.add(vbox1);
gtk_container_set_border_width( GTK_CONTAINER( vbox1 ), 5 );
- hbox2 = gtk_hbox_new( TRUE, 5 );
+ hbox2 = ui::HBox( TRUE, 5 );
gtk_widget_set_name( hbox2, "hbox2" );
gtk_widget_show( hbox2 );
gtk_box_pack_start( GTK_BOX( vbox1 ), hbox2, FALSE, FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( hbox2 ), 5 );
- vbox4 = gtk_vbox_new( TRUE, 0 );
+ vbox4 = ui::VBox( TRUE, 0 );
gtk_widget_set_name( vbox4, "vbox4" );
gtk_widget_show( vbox4 );
gtk_box_pack_start( GTK_BOX( hbox2 ), vbox4, TRUE, FALSE, 0 );
r_collapse = gtk_radio_button_new_with_mnemonic( NULL, "Collapse mesh" );
gtk_widget_set_name( r_collapse, "r_collapse" );
- gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), r_collapse, "Collapse all brushes into a single group", "Collapse all brushes into a single group" );
+ gtk_widget_set_tooltip_text(r_collapse, "Collapse all brushes into a single group");
gtk_widget_show( r_collapse );
gtk_box_pack_start( GTK_BOX( vbox4 ), r_collapse, FALSE, FALSE, 0 );
gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapse ), r_collapse_group );
r_collapsebymaterial = gtk_radio_button_new_with_mnemonic( NULL, "Collapse by material" );
gtk_widget_set_name( r_collapsebymaterial, "r_collapsebymaterial" );
- gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), r_collapsebymaterial, "Collapse into groups by material", "Collapse into groups by material" );
+ gtk_widget_set_tooltip_text(r_collapsebymaterial, "Collapse into groups by material");
gtk_widget_show( r_collapsebymaterial );
gtk_box_pack_start( GTK_BOX( vbox4 ), r_collapsebymaterial, FALSE, FALSE, 0 );
gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapsebymaterial ), r_collapse_group );
r_nocollapse = gtk_radio_button_new_with_mnemonic( NULL, "Don't collapse" );
gtk_widget_set_name( r_nocollapse, "r_nocollapse" );
- gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), r_nocollapse, "Every brush is stored in its own group", "Every brush is stored in its own group" );
+ gtk_widget_set_tooltip_text(r_nocollapse, "Every brush is stored in its own group");
gtk_widget_show( r_nocollapse );
gtk_box_pack_start( GTK_BOX( vbox4 ), r_nocollapse, FALSE, FALSE, 0 );
gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_nocollapse ), r_collapse_group );
r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_nocollapse ) );
- vbox3 = gtk_vbox_new( FALSE, 0 );
+ vbox3 = ui::VBox( FALSE, 0 );
gtk_widget_set_name( vbox3, "vbox3" );
gtk_widget_show( vbox3 );
gtk_box_pack_start( GTK_BOX( hbox2 ), vbox3, FALSE, FALSE, 0 );
- b_export = gtk_button_new_from_stock( "gtk-save" );
+ auto b_export = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-save" )));
gtk_widget_set_name( b_export, "b_export" );
gtk_widget_show( b_export );
gtk_box_pack_start( GTK_BOX( vbox3 ), b_export, TRUE, FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( b_export ), 5 );
- b_close = gtk_button_new_from_stock( "gtk-cancel" );
+ auto b_close = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-cancel" )));
gtk_widget_set_name( b_close, "b_close" );
gtk_widget_show( b_close );
gtk_box_pack_start( GTK_BOX( vbox3 ), b_close, TRUE, FALSE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( b_close ), 5 );
- vbox2 = gtk_vbox_new( FALSE, 5 );
+ vbox2 = ui::VBox( FALSE, 5 );
gtk_widget_set_name( vbox2, "vbox2" );
gtk_widget_show( vbox2 );
gtk_box_pack_start( GTK_BOX( vbox1 ), vbox2, TRUE, TRUE, 0 );
gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 2 );
- label1 = gtk_label_new( "Ignored materials:" );
+ label1 = ui::Label( "Ignored materials:" );
gtk_widget_set_name( label1, "label1" );
gtk_widget_show( label1 );
gtk_box_pack_start( GTK_BOX( vbox2 ), label1, FALSE, FALSE, 0 );
- scrolledwindow1 = gtk_scrolled_window_new( NULL, NULL );
+ auto scrolledwindow1 = ui::ScrolledWindow(ui::New);
gtk_widget_set_name( scrolledwindow1, "scrolledwindow1" );
- gtk_widget_show( scrolledwindow1 );
+ scrolledwindow1.show();
gtk_box_pack_start( GTK_BOX( vbox2 ), scrolledwindow1, TRUE, TRUE, 0 );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scrolledwindow1 ), GTK_SHADOW_IN );
- t_materialist = gtk_tree_view_new();
+ auto t_materialist = ui::TreeView(ui::New);
gtk_widget_set_name( t_materialist, "t_materialist" );
- gtk_widget_show( t_materialist );
- gtk_container_add( GTK_CONTAINER( scrolledwindow1 ), t_materialist );
+ t_materialist.show();
+ scrolledwindow1.add(t_materialist);
gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( t_materialist ), FALSE );
gtk_tree_view_set_enable_search( GTK_TREE_VIEW( t_materialist ), FALSE );
- ed_materialname = gtk_entry_new();
+ ed_materialname = ui::Entry(ui::New);
gtk_widget_set_name( ed_materialname, "ed_materialname" );
gtk_widget_show( ed_materialname );
gtk_box_pack_start( GTK_BOX( vbox2 ), ed_materialname, FALSE, FALSE, 0 );
- hbox1 = gtk_hbox_new( TRUE, 0 );
+ hbox1 = ui::HBox( TRUE, 0 );
gtk_widget_set_name( hbox1, "hbox1" );
gtk_widget_show( hbox1 );
gtk_box_pack_start( GTK_BOX( vbox2 ), hbox1, FALSE, FALSE, 0 );
- b_addmaterial = gtk_button_new_from_stock( "gtk-add" );
+ auto b_addmaterial = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-add" )));
gtk_widget_set_name( b_addmaterial, "b_addmaterial" );
gtk_widget_show( b_addmaterial );
gtk_box_pack_start( GTK_BOX( hbox1 ), b_addmaterial, FALSE, FALSE, 0 );
- b_removematerial = gtk_button_new_from_stock( "gtk-remove" );
+ auto b_removematerial = ui::Button(GTK_BUTTON(gtk_button_new_from_stock( "gtk-remove" )));
gtk_widget_set_name( b_removematerial, "b_removematerial" );
gtk_widget_show( b_removematerial );
gtk_box_pack_start( GTK_BOX( hbox1 ), b_removematerial, FALSE, FALSE, 0 );
gtk_widget_show( t_objects );
gtk_box_pack_end( GTK_BOX( vbox2 ), t_objects, FALSE, FALSE, 0 );
- t_exportmaterials = gtk_check_button_new_with_mnemonic( "Create material information (.mtl file)" );
+ auto t_exportmaterials = ui::CheckButton(GTK_CHECK_BUTTON(gtk_check_button_new_with_mnemonic( "Create material information (.mtl file)" )));
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( t_exportmaterials ), true );
gtk_widget_set_name( t_exportmaterials, "t_exportmaterials" );
gtk_widget_show( t_exportmaterials );
gtk_box_pack_end( GTK_BOX( vbox2 ), t_exportmaterials, FALSE, FALSE, 10 );
using namespace callbacks;
- g_signal_connect( G_OBJECT( w_plugplug2 ), "destroy", G_CALLBACK( OnDestroy ), NULL );
+ w_plugplug2.connect( "destroy", G_CALLBACK( OnDestroy ), NULL );
g_signal_connect_swapped( G_OBJECT( b_close ), "clicked", G_CALLBACK( OnDestroy ), NULL );
- g_signal_connect( ( gpointer )b_export, "clicked", G_CALLBACK( OnExportClicked ), NULL );
- g_signal_connect( ( gpointer )b_addmaterial, "clicked", G_CALLBACK( OnAddMaterial ), NULL );
- g_signal_connect( ( gpointer )b_removematerial, "clicked", G_CALLBACK( OnRemoveMaterial ), NULL );
- g_signal_connect( ( gpointer )t_exportmaterials, "clicked", G_CALLBACK( OnExportMatClicked ), NULL );
+ b_export.connect( "clicked", G_CALLBACK( OnExportClicked ), NULL );
+ b_addmaterial.connect( "clicked", G_CALLBACK( OnAddMaterial ), NULL );
+ b_removematerial.connect( "clicked", G_CALLBACK( OnRemoveMaterial ), NULL );
+ t_exportmaterials.connect( "clicked", G_CALLBACK( OnExportMatClicked ), NULL );
/* Store pointers to all widgets, for use by lookup_widget(). */
GLADE_HOOKUP_OBJECT_NO_REF( w_plugplug2, w_plugplug2, "w_plugplug2" );
// spawn plugin window (and make sure it got destroyed first or never created)
void CreateWindow( void ){
- ASSERT_NOTNULL( !g_brushexp_window );
+ ASSERT_TRUE( !g_brushexp_window );
GtkWidget* wnd = create_w_plugplug2();
GtkTreeViewColumn* col = gtk_tree_view_column_new();
gtk_tree_view_column_set_title( col, "materials" );
gtk_tree_view_append_column( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), col );
- GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
+ auto renderer = ui::CellRendererText(ui::New);
gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), -1, "", renderer, "text", 0, NULL );
// list store
- GtkListStore* ignorelist = gtk_list_store_new( 1, G_TYPE_STRING );
+ ui::ListStore ignorelist = ui::ListStore(gtk_list_store_new( 1, G_TYPE_STRING ));
gtk_tree_view_set_model( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), GTK_TREE_MODEL( ignorelist ) );
- g_object_unref( ignorelist );
+ ignorelist.unref();
gtk_widget_show_all( wnd );
g_brushexp_window = wnd;
void DestroyWindow( void ){
ASSERT_NOTNULL( g_brushexp_window );
- gtk_widget_destroy( g_brushexp_window );
+ ui::Widget(g_brushexp_window).destroy();
g_brushexp_window = 0;
}
projects / xonotic / netradiant.git / blobdiff