X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d4b632ba3c0e5e5c43412d2d7a2b485b8fcebf2..72a7edf007f57bc9dacea77c408adb86a57d41f7:/src/os2/choice.cpp

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index dbfeedf60a..be96555450 100644
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -31,11 +31,7 @@ bool wxChoice::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)
 {
@@ -220,7 +216,7 @@ void wxChoice::DoSetSize(int x, int y,
     wxControl::DoSetSize(x, y, width, -1, sizeFlags);
 }
 
-wxSize wxChoice::DoGetBestSize()
+wxSize wxChoice::DoGetBestSize() const
 {
     // find the widest string
     int wLine;
@@ -241,7 +237,7 @@ wxSize wxChoice::DoGetBestSize()
 
     // the combobox should be larger than the widest string
     int cx, cy;
-    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+    wxGetCharSize(GetHWND(), &cx, &cy, (wxFont*)&GetFont());
 
     wChoice += 5*cx;