fixed compilation errors in prior checkin; some minor cleanup

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index dbc406c76886dfd7f2fd7d1f24665d6c525b4fb7..8a07a0bbc62193657599a308a27b900acd6bc75e 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -107,7 +107,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
         }
     }
 #endif
-    
+
     return pt;
 }
 
@@ -232,24 +232,23 @@ void wxFrame::DetachMenuBar()
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
-    wxToplLevelWindowMac* tlw = wxFindWinFromMacWindow(FrontNonFloatingWindow()) ;
+    wxTopLevelWindowMac* tlw = wxFindWinFromMacWindow( FrontNonFloatingWindow() );
+    bool makeCurrent = false;
 
-    bool makeCurrent = false ;
-    
     // 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 ( (tlw == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) )
+        makeCurrent = true;
+    // or there is an app-level menubar like MDI
+    else if ( (GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) )
+        makeCurrent = true;
+
+    wxFrameBase::AttachMenuBar( menuBar );
 
     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 wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;