popup activation scope and l&f

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 58a00ae186b50cad1700e7d0b280d047bab1212a..6fd6dfae0df05bca9395352c4a3550c7fcce487e 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -25,8 +25,6 @@
 #include "wx/mac/private.h"
 #include "wx/mac/uma.h"
 
-extern wxWindowList wxModelessWindows;
-
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
@@ -40,7 +38,7 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
     EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
-static const wxChar *TRACE_MDI = _T("mdi");
+#define TRACE_MDI "mdi"
 
 static const int IDM_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
@@ -119,12 +117,14 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
         m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
     }
 
-    wxFrame::Create( parent , id , title , pos , size , style , name ) ;
+    if ( !wxFrame::Create( parent , id , title , pos , size , style , name ) )
+        return false;
+
     m_parentFrameActive = true;
 
-    OnCreateClient();
+    m_clientWindow = OnCreateClient();
 
-    return true;
+    return m_clientWindow != NULL;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
@@ -275,9 +275,7 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
-    m_clientWindow = new wxMDIClientWindow( this );
-
-    return m_clientWindow;
+    return new wxMDIClientWindow( this );
 }
 
 // Responds to colour changes, and passes event on to children.
@@ -391,12 +389,11 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
     if (parent)
         parent->AddChild(this);
 
-    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+    MacCreateRealWindow( pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+    SetTitle( title );
 
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
 
-    wxModelessWindows.Append(this);
-
     return true;
 }
 
@@ -499,8 +496,6 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) )
         return false;
 
-    wxModelessWindows.Append(this);
-
     return true;
 }