synchronize GTK2 minimum version in docs

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

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index 738ca21a9d05cd5d82b1ebf5d28fba29f4080ab6..bbe877bd1b45a40a9f49ce5f37fbce1bd73c2d9c 100644 (file)
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -116,11 +116,6 @@ public:
         @param name
             Window name.
 
         @param name
             Window name.
 

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

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


@@ -159,11 +154,6 @@ public:
         @param name
             Window name.
 
         @param name
             Window name.
 

-        @beginWxPythonOnly
-        The wxComboBox constructor in wxPython reduces the @a n and @a choices
-        arguments are 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


@@ -259,11 +249,6 @@ public:
 
     /**
         Same as wxTextEntry::SetSelection().
 
     /**
         Same as wxTextEntry::SetSelection().

-
-        @beginWxPythonOnly
-        This method is called SetMark() in wxPython, "SetSelection" is kept for
-        wxControlWithItems::SetSelection().
-        @endWxPythonOnly

     */
     virtual void SetSelection(long from, long to);
 
     */
     virtual void SetSelection(long from, long to);
 


@@ -285,10 +270,11 @@ public:
     /**
         Shows the list box portion of the combo box.
 
     /**
         Shows the list box portion of the combo box.
 

-        Currently only implemented in wxMSW and wxGTK.
+        Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.

 
         Notice that calling this function will generate a
 
         Notice that calling this function will generate a

-        @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event.
+        @c wxEVT_COMMAND_COMBOBOX_DROPDOWN event except under wxOSX where
+        generation of this event is not supported at all.

 
         @since 2.9.1
     */
 
         @since 2.9.1
     */


@@ -297,23 +283,31 @@ public:
     /**
         Hides the list box portion of the combo box.
 
     /**
         Hides the list box portion of the combo box.
 

-        Currently only implemented in wxMSW and wxGTK.
+        Currently this method is implemented in wxMSW, wxGTK and wxOSX/Cocoa.

 
         Notice that calling this function will generate a
 
         Notice that calling this function will generate a

-        @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event.
+        @c wxEVT_COMMAND_COMBOBOX_CLOSEUP event except under wxOSX where
+        generation of this event is not supported at all.

 
         @since 2.9.1
     */
     virtual void Dismiss();
 
         @since 2.9.1
     */
     virtual void Dismiss();

-    
+

     virtual int GetSelection() const;
     virtual void GetSelection(long *from, long *to) const;
     virtual void SetSelection(int n);
     virtual int GetSelection() const;
     virtual void GetSelection(long *from, long *to) const;
     virtual void SetSelection(int n);

-    virtual void SetSelection(long from, long to);

     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const;
     virtual wxString GetStringSelection() const;
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const;
     virtual wxString GetStringSelection() const;

-    virtual void SetString(unsigned int n, const wxString& s);
+
+    /**
+        Changes the text of the specified combobox item.
+
+        Notice that if the item is the currently selected one, i.e. if its text
+        is displayed in the text part of the combobox, then the text is also
+        replaced with the new @a text.
+     */
+    virtual void SetString(unsigned int n, const wxString& text);

 
     virtual unsigned int GetCount() const;
 };
 
     virtual unsigned int GetCount() const;
 };