Merge commit 'c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f' into master-merge

[xonotic/netradiant.git] / contrib / bobtoolz / ctfToolz-GTK.cpp

diff --git a/contrib/bobtoolz/ctfToolz-GTK.cpp b/contrib/bobtoolz/ctfToolz-GTK.cpp
index 54a5efcaec8aff8473cb6969af42348fcd5f3fd5..c4b6c6d511b869a461ae0010866a59fbb431dbde 100644 (file)
--- a/contrib/bobtoolz/ctfToolz-GTK.cpp
+++ b/contrib/bobtoolz/ctfToolz-GTK.cpp
@@ -37,24 +37,14 @@ BOOL g_bBSPInitDone                 = FALSE;
 static const char *PLUGIN_COMMANDS = ABOUT_CMD ",Colour Changer...,Swap Light Colours,Change Angles 180,Swap Spawn Points";
 
 // globals
-GtkWidget *g_pRadiantWnd = NULL;
-
-static const char *PLUGIN_ABOUT =
-                       PLUGIN_NAME for " RADIANT_NAME "\n\n"
-                       "Written by djbob\n\n"
-//                     20190605 dead link
-//                     "http://www.planetquake.com/toolz\n\n"
-//                     http://web.archive.org/web/20140109083123/http://planetquake.gamespy.com/toolz
-                       "Built against "
-                       RADIANT_NAME " " RADIANT_VERSION "\n"
-                       __DATE__;
+GtkWidget *main_window = NULL;
 
 extern "C" LPVOID WINAPI QERPlug_GetFuncTable(){
        return &g_FuncTable;
 }
 
 extern "C" LPCSTR WINAPI QERPlug_Init( HMODULE hApp, GtkWidget* pMainWidget ){
-       g_pRadiantWnd = pMainWidget;
+       main_window = pMainWidget;
        memset( &g_FuncTable, 0, sizeof( _QERFuncTable_1 ) );
        g_FuncTable.m_fVersion = QER_PLUG_VERSION;
        g_FuncTable.m_nSize = sizeof( _QERFuncTable_1 );
@@ -86,7 +76,19 @@ extern "C" void WINAPI QERPlug_Dispatch( LPCSTR p, vec3_t vMin, vec3_t vMax, boo
        }
 
        if ( !strcmp( p, CMD_ABOUT ) ) {
-               DoMessageBox( PLUGIN_ABOUT, "About", IDOK );
+               const char *label_text =
+                       PLUGIN_NAME for " RADIANT_NAME "\n\n"
+                       "Written by djbob\n\n"
+//                     20190605 dead link
+//                     "http://www.planetquake.com/toolz\n\n"
+                       "Built against "
+                       RADIANT_NAME " " RADIANT_VERSION "\n"
+                       __DATE__;
+
+               GlobalRadiant().m_pfnMessageBox( main_window, label_text,
+                                                                               "About " PLUGIN_NAME,
+                                                                               eMB_OK,
+                                                                               eMB_ICONDEFAULT );
        }
        else if ( !strcmp( p, "Colour Changer..." ) ) {
                DoCTFColourChanger();