fixing NULL vs 0 warnings in gcc 4

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 0c80890f18b3ca40d97a0b62f7eb293ecd2ae177..fa7f6c0b61a09af38bf99474b7410c6f5e2a55c4 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -9,10 +9,12 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "mdi.h"
 #endif
 
 #pragma implementation "mdi.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/mdi.h"
 #include "wx/menu.h"
 #include "wx/settings.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
     if ( show )
     {
         // TODO: check for other children

-        Move(-10000, -10000);
+        if(!GetToolBar())
+            Move(-10000, -10000);

     }
 
     if ( !wxFrame::Show(show) )
     }
 
     if ( !wxFrame::Show(show) )