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

OSX renaming round 2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-30 14:52:41 +00:00
parent 9729777e2a
commit 292e5e1f17
15 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/carbon/frame.cpp
View File

@@ -86,7 +86,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
}
else
{
#if !wxMAC_USE_NATIVE_TOOLBAR
#if !wxOSX_USE_NATIVE_TOOLBAR
pt.y += h;
#endif
}
@@ -268,7 +268,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
}
else
{
#if !wxMAC_USE_NATIVE_TOOLBAR
#if !wxOSX_USE_NATIVE_TOOLBAR
if ( y )
*y -= h;
#endif
@@ -318,14 +318,14 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
if ( m_frameToolBar == toolbar )
return ;
#if wxMAC_USE_NATIVE_TOOLBAR
#if wxOSX_USE_NATIVE_TOOLBAR
if ( m_frameToolBar )
m_frameToolBar->MacInstallNativeToolbar( false ) ;
#endif
m_frameToolBar = toolbar ;
#if wxMAC_USE_NATIVE_TOOLBAR
#if wxOSX_USE_NATIVE_TOOLBAR
if ( toolbar )
toolbar->MacInstallNativeToolbar( true ) ;
#endif
@@ -380,7 +380,7 @@ void wxFrame::PositionToolBar()
}
else
{
#if !wxMAC_USE_NATIVE_TOOLBAR
#if !wxOSX_USE_NATIVE_TOOLBAR
// Use the 'real' position
GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS );
#endif