synchronize GTK2 minimum version in docs

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

diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index fff0dfbfde4db063c39cf418f8176bda6416d8c9..04fe54ec4f4cd3e782fc900c2d9f5e0f3392d3a1 100644 (file)
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -66,13 +66,6 @@ public:
 
         @see Create(), wxValidator
 
 
         @see Create(), wxValidator
 

-        @beginWxPythonOnly
-
-        The wxChoice constructor in wxPython reduces the @a n and @a choices
-        arguments to a single argument, which is a list of strings.
-
-        @endWxPythonOnly
-

         @beginWxPerlOnly
         Not supported by wxPerl.
         @endWxPerlOnly
         @beginWxPerlOnly
         Not supported by wxPerl.
         @endWxPerlOnly


@@ -108,13 +101,6 @@ public:
 
         @see Create(), wxValidator
 
 
         @see Create(), wxValidator
 

-        @beginWxPythonOnly
-
-        The wxChoice constructor in wxPython reduces the @a n and @a choices
-        arguments to a single argument, which is a list of strings.
-
-        @endWxPythonOnly
-

         @beginWxPerlOnly
         Use an array reference for the @a choices parameter.
         @endWxPerlOnly
         @beginWxPerlOnly
         Use an array reference for the @a choices parameter.
         @endWxPerlOnly


@@ -184,5 +170,15 @@ public:
                  anything under other platforms.
     */
     virtual void SetColumns(int n = 1);
                  anything under other platforms.
     */
     virtual void SetColumns(int n = 1);

+
+    virtual bool IsSorted() const;
+    
+    virtual unsigned int GetCount() const ;
+    virtual int GetSelection() const ;
+    virtual void SetSelection(int n);
+
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const ;
+    virtual void SetString(unsigned int pos, const wxString& s);

 };
 
 };