Applied patch from Bo, WIP

[wxWidgets.git] / src / palmos / mdi.cpp

diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp
index 5fe6e7cfae5399546347e40b0429fb8dbf500238..23385f32ef643323076247075f0dfabf6c874fd7 100644 (file)
--- a/src/palmos/mdi.cpp
+++ b/src/palmos/mdi.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "mdi.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,34 +24,29 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
 
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
-    #if wxUSE_STATUSBAR
-        #include "wx/statusbr.h"
-    #endif
+    #include "wx/statusbr.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/toolbar.h"
 #endif
 
-#include "wx/mdi.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
     #include "wx/palmos/statbr95.h"
 #endif
 
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-
 #include <string.h>
 
 // ---------------------------------------------------------------------------
@@ -410,5 +401,4 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 {
 }
 
-#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
-
+#endif // wxUSE_MDI