supporting hidden status bar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
6944b203c4
commit
f5d63a57b1
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user