X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2aa607286c86f91bd8af9ac2d6287ba01521107c..2e36d5cf818d64c8abdb3da1861d233d774be139:/src/os2/frame.cpp?ds=inline diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index d6087502a3..4b5e439c6a 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -144,7 +144,6 @@ bool wxFrame::Create( ,rsName )) return FALSE; - SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); wxModelessWindows.Append(this); return TRUE; } // end of wxFrame::Create @@ -248,6 +247,26 @@ wxStatusBar* wxFrame::OnCreateStatusBar( if( !pStatusBar ) return NULL; + wxClientDC vDC(pStatusBar); + int nY; + + // + // Set the height according to the font and the border size + // + vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason + vDC.GetTextExtent( "X" + ,NULL + ,&nY + ); + + int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY()); + + pStatusBar->SetSize( -1 + ,-1 + ,-1 + ,nHeight + ); + ::WinSetParent( pStatusBar->GetHWND() ,m_hFrame ,FALSE