synchronize GTK2 minimum version in docs

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

diff --git a/interface/wx/listbox.h b/interface/wx/listbox.h
index 68fe933e8877391e41333ff2bb27359dcc6f3e18..295f0fab372a7e9e469ebb3e6581fa6acdc58732 100644 (file)
--- a/interface/wx/listbox.h
+++ b/interface/wx/listbox.h
@@ -259,30 +259,6 @@ public:
     */
     virtual bool IsSelected(int n) const;
 
     */
     virtual bool IsSelected(int n) const;
 

-    /**
-        Clears the list box and adds the given strings to it.
-
-        @param n
-            The number of strings to set.
-        @param choices
-            An array of strings to set.
-        @param clientData
-            Options array of client data pointers
-    */
-    void Set(unsigned int n, const wxString* choices, void *clientData);
-
-    /**
-        Clears the list box and adds the given strings to it.
-        You may free the array from the calling program after this method
-        has been called.
-
-        @param choices
-            An array of strings to set.
-        @param clientData
-            Options array of client data pointers
-    */
-    void Set(const wxArrayString& choices, void *clientData);
-

     /**
         Set the specified item to be the first visible item.
 
     /**
         Set the specified item to be the first visible item.
 


@@ -298,17 +274,32 @@ public:
             The string that should be visible.
     */
     void SetFirstItem(const wxString& string);
             The string that should be visible.
     */
     void SetFirstItem(const wxString& string);

-    
+
+    /**
+        Ensure that the item with the given index is currently shown.
+
+        Scroll the listbox if necessary.
+
+        This method is currently only implemented in wxGTK and wxOSX and does
+        nothing in other ports.
+
+        @see SetFirstItem()
+     */

     virtual void EnsureVisible(int n);
     virtual void EnsureVisible(int n);

-    
+
+    /**
+        Return true if the listbox has ::wxLB_SORT style.
+
+        This method is mostly meant for internal use only.
+     */

     virtual bool IsSorted() const;
     virtual bool IsSorted() const;

-    
-    // implement base class pure virtuals
-    virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
-    
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
+
+
+    // NOTE: Phoenix needs to see the implementation of pure virtuals so it
+    // knows that this class is not abstract.
+    virtual unsigned int GetCount() const; 
+    virtual wxString GetString(unsigned int n) const; 
+    virtual void SetString(unsigned int n, const wxString& s); 
+    virtual int FindString(const wxString& s, bool bCase = false) const;     

 };
 
 };