VA 4.0 fixes

[wxWidgets.git] / src / os2 / choice.cpp

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index dbfeedf60a77a9849e3f28595e593689e81eb05f..f834ab1fbc505a11ee146996d3dd49dc62ce7529 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -20,9 +20,7 @@
 
 #include "wx/os2/private.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-#endif
 
 bool wxChoice::Create(wxWindow *parent,
                       wxWindowID id,
@@ -31,11 +29,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 +214,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 +235,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;