X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe08e597048268b58f76f240e3f3dff52cdd6ffe..15678bec37c6e3cb8a67a8b041579af595d4ccf3:/src/mac/frame.cpp

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 04776b8cb1..f9f0d2bec6 100644
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -30,7 +30,6 @@ extern wxList wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
-//  EVT_SIZE(wxFrameMac::OnSize)
   EVT_ACTIVATE(wxFrameMac::OnActivate)
  // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
   EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
@@ -107,15 +106,8 @@ bool wxFrameMac::Create(wxWindow *parent,
 {
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
-
-  if (parent) parent->AddChild(this);
-
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;
 
   MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
   
@@ -129,23 +121,9 @@ bool wxFrameMac::Create(wxWindow *parent,
 wxFrameMac::~wxFrameMac()
 {
   m_isBeingDeleted = TRUE;
-  wxTopLevelWindows.DeleteObject(this);
 
   DeleteAllBars();
 
-/* Check if it's the last top-level window */
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       wxTheApp->ExitMainLoop() ;
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
 }
 
 
@@ -216,46 +194,39 @@ void wxFrameMac::OnActivate(wxActivateEvent& event)
 {
     if ( !event.GetActive() )
     {
-       // remember the last focused child
+       // remember the last focused child if it is our child
         m_winLastFocused = FindFocus();
-        while ( m_winLastFocused )
+
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )
         {
-            if ( GetChildren().Find(m_winLastFocused) )
+            if ( win->IsTopLevel() )
+            {
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }
+
                 break;
+            }
 
-            m_winLastFocused = m_winLastFocused->GetParent();
+            win = win->GetParent();
         }
 
         event.Skip();
     }
 	else
 	{
-/*
-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        // FIXME all this is totally bogus - we need to do the same as wxPanel,
-        //       but how to do it without duplicating the code?
-
-        // restore focus
-        wxWindow *child = node->GetData();
-
-        if ( !child->IsTopLevel() && child->AcceptsFocus()
-#if wxUSE_TOOLBAR
-             && !wxDynamicCast(child, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
-             && !wxDynamicCast(child, wxStatusBar)
-#endif // wxUSE_STATUSBAR
-           )
+        // restore focus to the child which was last focused
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
         {
-            child->SetFocus();
-            break;
+            parent = this;
         }
-    }
-   */
-    	wxSetFocusToChild(this, &m_winLastFocused);
+
+    	wxSetFocusToChild(parent, &m_winLastFocused);
 
 	    if ( m_frameMenuBar != NULL )
 	    {