Merge commit 'c845c5cd8f427d39665d6a8b1f6eeff401370d80' into garux-merge

[xonotic/netradiant.git] / contrib / brushexport / plugin.cpp

diff --git a/contrib/brushexport/plugin.cpp b/contrib/brushexport/plugin.cpp
index 581878710b4f9d75d6fbf5be0be0da19993e0019..77c54c7e1f1b7afc661e692615582c4d32a10ff0 100644 (file)
--- a/contrib/brushexport/plugin.cpp
+++ b/contrib/brushexport/plugin.cpp
@@ -24,7 +24,6 @@
 #include "qerplugin.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtktreeview.h>
 
 #include "debugging/debugging.h"
 #include "string/string.h"
@@ -48,16 +47,16 @@ void CreateWindow( void );
 void DestroyWindow( void );
 bool IsWindowOpen( void );
 
-GtkWidget *g_pRadiantWnd = NULL;
+ui::Widget g_pRadiantWnd{ui::null};
 
 namespace BrushExport
 {
-GtkWindow* g_mainwnd;
+ui::Window g_mainwnd{ui::null};
 
 const char* init( void* hApp, void* pMainWidget ){
-       g_mainwnd = (GtkWindow*)pMainWidget;
-       g_pRadiantWnd = (GtkWidget*)pMainWidget;
-       ASSERT_NOTNULL( g_mainwnd );
+       g_mainwnd = ui::Window::from(pMainWidget);
+       g_pRadiantWnd = ui::Window::from(pMainWidget);
+       ASSERT_TRUE( g_mainwnd );
        return "";
 }
 const char* getName(){
@@ -72,7 +71,7 @@ const char* getCommandTitleList(){
 
 void dispatch( const char* command, float* vMin, float* vMax, bool bSingleBrush ){
        if ( string_equal( command, "About" ) ) {
-               GlobalRadiant().m_pfnMessageBox( GTK_WIDGET( g_mainwnd ), "Brushexport plugin v 2.0 by namespace (www.codecreator.net)\n"
+               GlobalRadiant().m_pfnMessageBox( g_mainwnd, "Brushexport plugin v 2.0 by namespace (www.codecreator.net)\n"
                                                                                                                                  "Enjoy!\n\nSend feedback to spam@codecreator.net", "About me...",
                                                                                 eMB_OK,
                                                                                 eMB_ICONDEFAULT );