Temporary fix for link error to ~wxZipOutputStream()

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 0f083697c76f6b1d9fb549c2908e47f2962e9f66..7c46b0cca5e9388f3ad223390eb726e11e56af0d 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -34,7 +34,7 @@ class WXDLLIMPEXP_BASE wxArrayString;
 // global data
 // ----------------------------------------------------------------------------
 
 // global data
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase


@@ -65,12 +65,16 @@ public:
 
     // multiple selection logic
     virtual bool IsSelected(int n) const = 0;
 
     // multiple selection logic
     virtual bool IsSelected(int n) const = 0;

-    virtual void SetSelection(int n, bool select = true) = 0;
-    virtual void Select(int n) { SetSelection(n, true); }
-    void Deselect(int n) { SetSelection(n, false); }
+    virtual void SetSelection(int n) { DoSetSelection(n, true); }
+    void SetSelection(int n, bool select) { DoSetSelection(n, select); }
+    void Deselect(int n) { DoSetSelection(n, false); }

     void DeselectAll(int itemToLeaveSelected = -1);
 
     void DeselectAll(int itemToLeaveSelected = -1);
 

-    virtual bool SetStringSelection(const wxString& s, bool select = true);
+    virtual bool SetStringSelection(const wxString& s, bool select);
+    virtual bool SetStringSelection(const wxString& s)
+    {
+        return SetStringSelection(s, true);
+    }

 
     // works for single as well as multiple selection listboxes (unlike
     // GetSelection which only works for listboxes with single selection)
 
     // works for single as well as multiple selection listboxes (unlike
     // GetSelection which only works for listboxes with single selection)


@@ -119,6 +123,9 @@ protected:
 
     virtual void DoSetFirstItem(int n) = 0;
 
 
     virtual void DoSetFirstItem(int n) = 0;
 

+    virtual void DoSetSelection(int n, bool select) = 0;
+
+

     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };