Merge branch 'msys2thread' into 'master'

[xonotic/netradiant.git] / contrib / bkgrnd2d / dialog.cpp

diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp
index f6b0fb7f37a06cd87f791c445164e43fe9b5c72e..01a1b985b9b3e091bbcce460f1b22671cdfe12ae 100644 (file)
--- a/contrib/bkgrnd2d/dialog.cpp
+++ b/contrib/bkgrnd2d/dialog.cpp
@@ -34,7 +34,7 @@
 // spaces to make label nice and big
 #define NO_FILE_MSG "        (no file loaded)        "
 
-static GtkWidget *pDialogWnd;
+static ui::Window pDialogWnd{ui::null};
 static GtkWidget *pNotebook;
 static GtkTooltips *pTooltips;
 
@@ -307,7 +307,7 @@ void InitBackgroundDialog(){
        CBackgroundDialogPage *pPage;
 
        pDialogWnd = gtk_dialog_new_with_buttons( "Background Images",
-                                                                                         GTK_WINDOW( g_pMainWidget ),
+                                                                                         g_pMainWidget,
                                                                                          (GtkDialogFlags)( GTK_DIALOG_DESTROY_WITH_PARENT ),
                                                  // TODO dialog with no buttons
                                                  //                                                                              GTK_STOCK_CLOSE,
@@ -335,7 +335,7 @@ void InitBackgroundDialog(){
 }
 
 void ShowBackgroundDialog(){
-       gtk_window_present( GTK_WINDOW( pDialogWnd ) );
+       gtk_window_present( pDialogWnd );
 }
 
 void ShowBackgroundDialogPG( int page ){