Committing in .

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

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 7fa3750188190c708dc3cefb8954b675551ee7ff..5408910fb3864c529f9ae32f9a58b75e425190e8 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -81,11 +81,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 +606,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
 */
 }
 
-wxSize wxListBox::DoGetBestSize()
+wxSize wxListBox::DoGetBestSize() const
 {
     // find the widest string
     int wLine;
@@ -630,7 +626,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;