fixed compilation problem in pror commit

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index dbc406c76886dfd7f2fd7d1f24665d6c525b4fb7..399749a1b3e312ee2c8f6357ff0bd7c4d734481a 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -107,7 +107,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
         }
     }
 #endif
         }
     }
 #endif

-    
+

     return pt;
 }
 
     return pt;
 }
 


@@ -232,24 +232,23 @@ void wxFrame::DetachMenuBar()
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {

-    wxToplLevelWindowMac* tlw = wxFindWinFromMacWindow(FrontNonFloatingWindow()) ;
+    wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame );
+    bool makeCurrent = false;

 
 

-    bool makeCurrent = false ;
-    

     // if this is already the current menubar or we are the frontmost window
     // if this is already the current menubar or we are the frontmost window

-    if ( m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() || tlw == this )
-        makeCurrent = true ;
-    // or we have a situation where this is a App Level Menubar like MDI
-    else if ( tlw != NULL && tlw->GetMenuBar() == NULL && ((wxFrame*)wxTheApp->GetTopWindow()) == this )
-        makeCurrent = true ;
-    
-    wxFrameBase::AttachMenuBar(menuBar);
+    if ( (tlf == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) )
+        makeCurrent = true;
+    // or there is an app-level menubar like MDI
+    else if ( tlf && (tlf->GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) )
+        makeCurrent = true;
+
+    wxFrameBase::AttachMenuBar( menuBar );

 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
         if (makeCurrent)
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
         if (makeCurrent)

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

     }
 }
 
     }
 }
 


@@ -325,7 +324,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if ( m_frameToolBar == toolbar )
         return ;
 {
     if ( m_frameToolBar == toolbar )
         return ;

-    
+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;


@@ -383,5 +382,16 @@ void wxFrame::PositionToolBar()
         }
     }
 }
         }
     }
 }

+
+void wxFrame::PositionBars()
+{
+#if wxUSE_STATUSBAR
+    PositionStatusBar();
+#endif
+#if wxUSE_TOOLBAR
+    PositionToolBar();
+#endif
+}
+

 #endif
 
 #endif