Merge commit 'e876e8ef487eeb9123f4906373622ffe3b6ea9d4' into master-merge

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

diff --git a/contrib/bobtoolz/funchandlers-GTK.cpp b/contrib/bobtoolz/funchandlers-GTK.cpp
index aa8e64786a1eeba47bc8acc455514b706e1acfc4..decbf8ad49825f1ae49404e33ff484b97100bbb0 100644 (file)
--- a/contrib/bobtoolz/funchandlers-GTK.cpp
+++ b/contrib/bobtoolz/funchandlers-GTK.cpp
@@ -18,8 +18,9 @@
  */
 
 #include "funchandlers.h"
+#include "globaldefs.h"
 
-#ifdef WIN32
+#if GDEF_COMPILER_MSVC
 #pragma warning(disable : 4786)
 #endif
 
@@ -201,7 +202,7 @@ void DoFixBrushes(){
        globalOutputStream() << "bobToolz FixBrushes: " << count << " invalid/duplicate planes removed.\n";
 }
 
-void DoResetTextures(){
+void DoResetTextures( ui::Window main_window ){
        UndoableCommand undo( "bobToolz.resetTextures" );
        static ResetTextureRS rs;
 
@@ -216,7 +217,7 @@ void DoResetTextures(){
        }
 
        EMessageBoxReturn ret;
-       if ( ( ret = DoResetTextureBox( &rs ) ) == eIDCANCEL ) {
+       if ( ( ret = DoResetTextureBox( &rs, main_window ) ) == eIDCANCEL ) {
                return;
        }
 
@@ -361,10 +362,10 @@ void DoBuildDoors(){
        }
 }
 
-void DoPathPlotter(){
+void DoPathPlotter( ui::Window main_window ){
        UndoableCommand undo( "bobToolz.pathPlotter" );
        PathPlotterRS rs;
-       EMessageBoxReturn ret = DoPathPlotterBox( &rs );
+       EMessageBoxReturn ret = DoPathPlotterBox( &rs, main_window );
        if ( ret == eIDCANCEL ) {
                return;
        }