X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=7d1782eca9c9e1ebb1dd4460f5574442f218e2c0;hb=1ce2d1a4685918788e3f22c8f26f652e474da6c0;hp=880347f56ca1f32907f774dcb247ccabc582fdb0;hpb=465884e260039bad1a333c51b6013edd361a63cd;p=xonotic%2Fnetradiant.git

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 880347f5..7d1782ec 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -257,13 +257,13 @@ int m_nTotalHeight;
 CopiedString shader;
 
 ui::Window m_parent{ui::null};
-ui::Widget m_gl_widget;
+ui::GLArea m_gl_widget{ui::null};
 ui::Widget m_texture_scroll;
 ui::Widget m_treeViewTree;
 ui::Widget m_treeViewTags;
 ui::Frame m_tag_frame{ui::null};
-ui::ListStore m_assigned_store{nullptr};
-ui::ListStore m_available_store{nullptr};
+ui::ListStore m_assigned_store{ui::null};
+ui::ListStore m_available_store{ui::null};
 ui::Widget m_assigned_tree;
 ui::Widget m_available_tree;
 ui::Widget m_scr_win_tree;
@@ -273,7 +273,7 @@ ui::Button m_search_button{ui::null};
 ui::Widget m_shader_info_item;
 
 std::set<CopiedString> m_all_tags;
-ui::ListStore m_all_tags_list{nullptr};
+ui::ListStore m_all_tags_list{ui::null};
 std::vector<CopiedString> m_copied_tags;
 std::set<CopiedString> m_found_shaders;
 
@@ -1255,7 +1255,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){
 }
 
 void TextureBrowser_queueDraw( TextureBrowser& textureBrowser ){
-	if ( textureBrowser.m_gl_widget != 0 ) {
+	if ( textureBrowser.m_gl_widget ) {
 		gtk_widget_queue_draw( textureBrowser.m_gl_widget );
 	}
 }
@@ -2056,8 +2056,8 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 		widget_set_visible( g_TextureBrowser.m_texture_scroll, g_TextureBrowser.m_showTextureScrollbar );
 	}
 	{ // gl_widget
-		g_TextureBrowser.m_gl_widget = ui::Widget(glwidget_new( FALSE ));
-		g_object_ref( g_TextureBrowser.m_gl_widget );
+		g_TextureBrowser.m_gl_widget = glwidget_new( FALSE );
+		g_object_ref( g_TextureBrowser.m_gl_widget._handle );
 
 		gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
 		gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true );
@@ -2066,7 +2066,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 		g_TextureBrowser.m_gl_widget.show();
 
 		g_TextureBrowser.m_sizeHandler = g_TextureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser );
-		g_TextureBrowser.m_exposeHandler = g_TextureBrowser.m_gl_widget.connect( "expose_event", G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser );
+		g_TextureBrowser.m_exposeHandler = g_TextureBrowser.m_gl_widget.on_render( G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser );
 
 		g_TextureBrowser.m_gl_widget.connect( "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &g_TextureBrowser );
 		g_TextureBrowser.m_gl_widget.connect( "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &g_TextureBrowser );
@@ -2139,7 +2139,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 			auto renderer = ui::CellRendererText();
 
 			g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ) ));
-			g_object_unref( G_OBJECT( g_TextureBrowser.m_assigned_store ) );
+			g_TextureBrowser.m_assigned_store.unref();
 			g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL );
 			gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), FALSE );
 
@@ -2167,7 +2167,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 			auto renderer = ui::CellRendererText();
 
 			g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ) ));
-			g_object_unref( G_OBJECT( g_TextureBrowser.m_available_store ) );
+			g_TextureBrowser.m_available_store.unref();
 			g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL );
 			gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), FALSE );
 
@@ -2233,7 +2233,7 @@ void TextureBrowser_destroyWindow(){
 	g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler );
 	g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler );
 
-	g_object_unref( g_TextureBrowser.m_gl_widget );
+	g_TextureBrowser.m_gl_widget.unref();
 }
 
 const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){