X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/os2/listbox.cpp diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp index 7fa3750188..2ecb09a5eb 100644 --- a/src/os2/listbox.cpp +++ b/src/os2/listbox.cpp @@ -34,9 +34,7 @@ #include "wx/ownerdrw.h" #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl) -#endif // ============================================================================ // list box item declaration and implementation @@ -81,11 +79,7 @@ bool wxListBox::Create(wxWindow *parent, int n, const wxString choices[], long style, #if wxUSE_VALIDATORS -# if defined(__VISAGECPP__) - const wxValidator* validator, -# else const wxValidator& validator, -# endif #endif const wxString& name) { @@ -610,7 +604,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s) */ } -wxSize wxListBox::DoGetBestSize() +wxSize wxListBox::DoGetBestSize() const { // find the widest string int wLine; @@ -630,7 +624,7 @@ wxSize wxListBox::DoGetBestSize() // the listbox should be slightly larger than the widest string int cx, cy; - wxGetCharSize(GetHWND(), &cx, &cy, &GetFont()); + wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont()); wListbox += 3*cx;