X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa21388719bc324227895bd2f1328d533dc130e2..9b9337da0c597d9ba18f731a4e641bda25437224:/src/os2/statbmp.cpp diff --git a/src/os2/statbmp.cpp b/src/os2/statbmp.cpp index 2581c22854..07856d8e84 100644 --- a/src/os2/statbmp.cpp +++ b/src/os2/statbmp.cpp @@ -71,13 +71,11 @@ bool wxStaticBitmap::Create( m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon)); - // TODO: create static bitmap control - const wxChar* zClassname = wxT("WX_STATIC"); int nWinstyle = m_bIsIcon ? SS_ICON : SS_BITMAP; m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND() - ,zClassname - ,wxT("") + ,WC_STATIC + ,rName.c_str() ,nWinstyle | WS_VISIBLE ,0,0,0,0 ,pParent->GetHWND() @@ -93,7 +91,7 @@ bool wxStaticBitmap::Create( // Subclass again for purposes of dialog editing mode SubclassWin(m_hWnd); - SetFont(GetParent()->GetFont()); + SetFont(*wxSMALL_FONT); SetSize(nX, nY, nWidth, nHeight); return(FALSE); } @@ -172,3 +170,11 @@ void wxStaticBitmap::SetImage( ::WinInvalidateRect(GetHwndOf(GetParent()), &vRect, TRUE); } +MRESULT wxStaticBitmap::OS2WindowProc( + WXUINT uMsg +, WXWPARAM wParam +, WXLPARAM lParam +) +{ + return wxWindow::OS2WindowProc(uMsg, wParam, lParam); +} // end of wxStaticBitmap::OS2WindowProc