X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04701dd94f691292563a1f0eb19933819b1c5fe9..3baaf31317b1380ba9f33f8a23ff04bd20356d63:/src/os2/statbox.cpp?ds=sidebyside diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp index 97f0152e57..85270d2462 100644 --- a/src/os2/statbox.cpp +++ b/src/os2/statbox.cpp @@ -22,14 +22,12 @@ #include "wx/statbox.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) BEGIN_EVENT_TABLE(wxStaticBox, wxControl) EVT_ERASE_BACKGROUND(wxStaticBox::OnEraseBackground) END_EVENT_TABLE() -#endif /* * Group box @@ -93,10 +91,10 @@ bool wxStaticBox::Create(wxWindow *parent, wxWindowID id, return FALSE; } -wxSize wxStaticBox::DoGetBestSize() +wxSize wxStaticBox::DoGetBestSize() const { int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont()); int wBox; GetTextExtent(wxGetWindowText(m_hWnd), &wBox, &cy); @@ -176,7 +174,7 @@ void wxStaticBox::OnEraseBackground(wxEraseEvent& event) */ } -MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxStaticBox::OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) { // TODO: /* @@ -194,7 +192,7 @@ MRESULT wxStaticBox::OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLP } */ - return wxControl::OS2WindowProc(hwnd, nMsg, wParam, lParam); + return wxControl::OS2WindowProc(nMsg, wParam, lParam); }