finished wxWindow for MGL

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

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index 81149bf414d45193d2de9c3518497751d25b61ce..790d8606ace147463705851002482013bf4281b3 100644 (file)
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -42,7 +42,9 @@ public:
             const wxSize& size = wxDefaultSize,
             int n = 0, const wxString choices[] = NULL,
             long style = 0,
             const wxSize& size = wxDefaultSize,
             int n = 0, const wxString choices[] = NULL,
             long style = 0,

+#if wxUSE_VALIDATORS

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

+#endif

             const wxString& name = wxListBoxNameStr)
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
             const wxString& name = wxListBoxNameStr)
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);


@@ -53,7 +55,9 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxSize& size = wxDefaultSize,
                 int n = 0, const wxString choices[] = NULL,
                 long style = 0,

+#if wxUSE_VALIDATORS

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

+#endif

                 const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();
                 const wxString& name = wxListBoxNameStr);
 
     virtual ~wxListBox();


@@ -119,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