X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2680ced12cbbed16990007c5fa3ea7730700122..ef6ece2352e739f843d9fc08d96d46b6467b83d6:/src/osx/carbon/frame.cpp?ds=inline diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp index ca668dc372..515da910a2 100644 --- a/src/osx/carbon/frame.cpp +++ b/src/osx/carbon/frame.cpp @@ -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