simplify OnActivate menubar install code

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 399749a1b3e312ee2c8f6357ff0bd7c4d734481a..c888e6c41d114c66af83623f28a7c41cf4e58b16 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -24,7 +24,7 @@
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-extern wxList wxPendingDelete;
+//extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -134,7 +134,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     wxStatusBar *statusBar;
 
     statusBar = new wxStatusBar(this, id, style, name);
     wxStatusBar *statusBar;
 
     statusBar = new wxStatusBar(this, id, style, name);

-    statusBar->SetSize(100 , WX_MAC_STATUSBAR_HEIGHT);
+    statusBar->SetSize(100, WX_MAC_STATUSBAR_HEIGHT);

     statusBar->SetFieldsCount(number);
 
     return statusBar;
     statusBar->SetFieldsCount(number);
 
     return statusBar;


@@ -204,21 +204,25 @@ void wxFrame::OnActivate(wxActivateEvent& event)
             ? m_winLastFocused->GetParent()
             : NULL;
 
             ? m_winLastFocused->GetParent()
             : NULL;
 

-        if ( !parent )
+        if (parent == NULL)

             parent = this;
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
         if (m_frameMenuBar != NULL)
         {
             parent = this;
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
         if (m_frameMenuBar != NULL)
         {

-            m_frameMenuBar->MacInstallMenuBar() ;
+            m_frameMenuBar->MacInstallMenuBar();

         }
         }

-        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        else

         {
         {

-            // Trying toplevel frame membar
-            if (((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar())
-                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
-         }
+            wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
+            if (tlf != NULL)
+            {
+                // Trying top-level frame membar
+                if (tlf->GetMenuBar())
+                    tlf->GetMenuBar()->MacInstallMenuBar();
+            }
+        }

     }
 }
 
     }
 }