X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f80ffb32eb597f7b051ed1705c72b2934eb2eb30..75a937411ce0aa5856b135f2d0f9406ac83e9cce:/src/mac/carbon/frame.cpp diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp index 10299ff3d2..ac1391d4de 100644 --- a/src/mac/carbon/frame.cpp +++ b/src/mac/carbon/frame.cpp @@ -40,7 +40,7 @@ END_EVENT_TABLE() IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) #endif -#define WX_MAC_STATUSBAR_HEIGHT 15 +#define WX_MAC_STATUSBAR_HEIGHT 18 // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -117,7 +117,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, void wxFrame::PositionStatusBar() { - if (m_frameStatusBar ) + if (m_frameStatusBar && m_frameStatusBar->IsShown() ) { int w, h; GetClientSize(&w, &h); @@ -224,7 +224,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const wxTopLevelWindow::DoGetClientSize( x , y ) ; #if wxUSE_STATUSBAR - if ( GetStatusBar() && y ) + if ( GetStatusBar() && GetStatusBar()->IsShown() && y ) { if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT; } @@ -289,7 +289,7 @@ void wxFrame::PositionToolBar() GetSize( &cw , &ch ) ; - if ( GetStatusBar() ) + if ( GetStatusBar() && GetStatusBar()->IsShown()) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY);