moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

[wxWidgets.git] / include / wx / os2 / listbox.h

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index 4a5691fb7ba9b686cf72a0cba5bc18135a6535f8..790d8606ace147463705851002482013bf4281b3 100644 (file)
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -43,11 +43,7 @@ public:
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
 #if wxUSE_VALIDATORS
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-            const wxValidator* validator = wxDefaultValidator,
-#  else

             const wxValidator& validator = wxDefaultValidator,
             const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
             const wxString& name = wxListBoxNameStr)
     {
 #endif
             const wxString& name = wxListBoxNameStr)
     {


@@ -60,11 +56,7 @@ public:
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
 #if wxUSE_VALIDATORS
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-                const wxValidator* validator = wxDefaultValidator,
-#  else

                 const wxValidator& validator = wxDefaultValidator,
                 const wxValidator& validator = wxDefaultValidator,

-#  endif

 #endif
                 const wxString& name = wxListBoxNameStr);
 
 #endif
                 const wxString& name = wxListBoxNameStr);
 


@@ -131,7 +123,7 @@ protected:
     int m_noItems;
     int m_selected;
 
     int m_noItems;
     int m_selected;
 

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

 
 #if wxUSE_OWNER_DRAWN
     // control items
 
 #if wxUSE_OWNER_DRAWN
     // control items