Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed compilation errors in prior checkin; some minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-20 19:49:10 +00:00
parent 10694396b6
commit be6068f6c3
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mac/carbon/frame.cpp
View File

@@ -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 ) ;