Include wx/mdi.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/aui/framemanager.cpp

@@ -35,16 +35,13 @@
     #include "wx/dcclient.h"
     #include "wx/dcscreen.h"
     #include "wx/toolbar.h"
+    #include "wx/mdi.h"
 #endif
 
 //#include "wx/dcbuffer.h"
 
 #include "wx/image.h"
 
-#if wxUSE_MDI
-     #include "wx/mdi.h"
-#endif
-
 WX_CHECK_BUILD_OPTIONS("wxAUI")
 
 #include "wx/arrimpl.cpp"

src/cocoa/mdi.mm

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cocoa/mdi.mm
+// Name:        src/cocoa/mdi.mm
 // Purpose:     wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow
 // Author:      David Elliott
 // Modified by:
@@ -13,9 +13,10 @@
 
 #if wxUSE_MDI
 
+#include "wx/mdi.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
-    #include "wx/mdi.h"
 #endif // WX_PRECOMP
 
 // #include "wx/cocoa/autorelease.h"
@@ -323,7 +324,7 @@ wxMDIClientWindow::wxMDIClientWindow()
 }
 
 wxMDIClientWindow::wxMDIClientWindow(wxMDIParentFrame *parent, long style)
-:   wxWindow(parent, -1)
+                  :wxWindow(parent, wxID_ANY)
 {
 }
 

src/common/docview.cpp

@@ -40,6 +40,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/msgdlg.h"
+    #include "wx/mdi.h"
 #endif
 
 #include "wx/ffile.h"
@@ -48,10 +49,6 @@
     #include "wx/filename.h"
 #endif
 
-#ifdef __WXGTK__
-    #include "wx/mdi.h"
-#endif
-
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/prntbase.h"
     #include "wx/printdlg.h"

src/mac/carbon/mdi.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.cpp
+// Name:        src/mac/carbon/mdi.cpp
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
@@ -13,8 +13,9 @@
 
 #if wxUSE_MDI
 
+#include "wx/mdi.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/mdi.h"
     #include "wx/log.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
@@ -359,10 +360,10 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 {
     SetName(name);
 
-    if ( id > -1 )
-        m_windowId = id;
-    else
+    if ( id == wxID_ANY )
         m_windowId = (int)NewControlId();
+    else
+        m_windowId = id;
 
     if (parent)
         parent->AddChild(this);
@@ -492,4 +493,3 @@ void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 }
 
 #endif // wxUSE_MDI
-

src/msw/mdi.cpp

@@ -26,6 +26,8 @@
 
 #if wxUSE_MDI && !defined(__WXUNIVERSAL__)
 
+#include "wx/mdi.h"
+
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
     #include "wx/menu.h"
@@ -42,7 +44,6 @@
 #endif
 
 #include "wx/stockitem.h"
-#include "wx/mdi.h"
 #include "wx/msw/private.h"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR

src/palmos/mdi.cpp

@@ -24,7 +24,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
+#if wxUSE_MDI
+
+#include "wx/mdi.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
@@ -41,7 +43,6 @@
     #include "wx/toolbar.h"
 #endif
 
-#include "wx/mdi.h"
 #include "wx/palmos/private.h"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
@@ -402,4 +403,4 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 {
 }
 
-#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_MDI

src/xrc/xh_mdi.cpp

@@ -23,10 +23,9 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
+    #include "wx/mdi.h"
 #endif
 
-#include "wx/mdi.h"
-
 IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
 
 wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()