X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a317e61887db770025fc6c642c2105f1cefe3ac..49e3e2c25f93dd8114b36155de1756139b7f18b9:/src/univ/framuniv.cpp diff --git a/src/univ/framuniv.cpp b/src/univ/framuniv.cpp index d4c06aa36b..c61366cee5 100644 --- a/src/univ/framuniv.cpp +++ b/src/univ/framuniv.cpp @@ -17,7 +17,7 @@ // headers // --------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univframe.h" #endif @@ -259,7 +259,9 @@ void wxFrame::DoSetClientSize(int width, int height) #if wxUSE_TOOLBAR if ( m_frameToolBar ) { +#if wxUSE_STATUSBAR height += m_frameStatusBar->GetSize().y; +#endif // wxUSE_STATUSBAR if ( m_frameToolBar->GetWindowStyleFlag() & wxTB_VERTICAL ) width += m_frameToolBar->GetSize().x;