Merge in from trunk r64802 - r68625

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

diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp
index cb49624b29eff7842741b6bf68011b143bb6b66f..23385f32ef643323076247075f0dfabf6c874fd7 100644 (file)
--- a/src/palmos/mdi.cpp
+++ b/src/palmos/mdi.cpp
@@ -24,34 +24,29 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI
+
+#include "wx/mdi.h"

 
 #ifndef WX_PRECOMP
 
 #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"
     #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/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/toolbar.h"

 #endif
 
 #endif
 

-#include "wx/mdi.h"

 #include "wx/palmos/private.h"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
     #include "wx/palmos/statbr95.h"
 #endif
 
 #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>
 
 // ---------------------------------------------------------------------------
 #include <string.h>
 
 // ---------------------------------------------------------------------------


@@ -406,5 +401,4 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 {
 }
 
 {
 }
 

-#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
-
+#endif // wxUSE_MDI