From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Thu, 8 Jun 2006 20:19:29 +0000 (+0000)
Subject: Include wx/mdi.h according to precompiled headers of wx/wx.h (with other minor cleaning).
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/59cf2e4999e9ae9bcdc2a3093dec4ec27b50df5b

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
---

diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp
index 20268d2c76..933aa5a75e 100644
--- a/src/aui/framemanager.cpp
+++ b/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"
diff --git a/src/cocoa/mdi.mm b/src/cocoa/mdi.mm
index 015445cccd..ef279856ca 100644
--- a/src/cocoa/mdi.mm
+++ b/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)
 {
 }
 
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index e97ea52f18..e33a33c339 100644
--- a/src/common/docview.cpp
+++ b/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"
diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 503efaaa61..867b9b3099 100644
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -1,20 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        mdi.cpp
+// Name:        src/mac/carbon/mdi.cpp
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #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"
@@ -31,12 +32,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
-  EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
+    EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
@@ -350,19 +351,19 @@ void wxMDIChildFrame::Init()
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
-    wxWindowID id,
-    const wxString& title,
-    const wxPoint& pos,
-    const wxSize& size,
-    long style,
-    const wxString& name)
+                             wxWindowID id,
+                             const wxString& title,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxString& name)
 {
     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
-
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 9d39671a99..cc017bff99 100644
--- a/src/msw/mdi.cpp
+++ b/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
diff --git a/src/palmos/mdi.cpp b/src/palmos/mdi.cpp
index 859faae02d..ae2e3a2c04 100644
--- a/src/palmos/mdi.cpp
+++ b/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
diff --git a/src/xrc/xh_mdi.cpp b/src/xrc/xh_mdi.cpp
index 4cc381ec7e..be0882245f 100644
--- a/src/xrc/xh_mdi.cpp
+++ b/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()