X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bba37f51ded370ee79e26916c4c94ce5dc1f44e..b409fa19591179c71e10c6d3c88814f2d96f3af9:/src/mac/carbon/mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 0c80890f18..fa7f6c0b61 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mdi.h"
 #endif
 
+#include "wx/wxprec.h"
+
 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.h"
@@ -234,7 +236,8 @@ bool wxMDIParentFrame::Show( bool show )
     if ( show )
     {
         // TODO: check for other children
-        Move(-10000, -10000);
+        if(!GetToolBar())
+            Move(-10000, -10000);
     }
 
     if ( !wxFrame::Show(show) )