Relax wxMessageDialog style checks, assume wxOK by default.

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

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index f692cc578b795ffbe69048e720026905a3a7d63d..bbe877bd1b45a40a9f49ce5f37fbce1bd73c2d9c 100644 (file)
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -116,11 +116,6 @@ public:
         @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
@@ -159,11 +154,6 @@ public:
         @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
@@ -259,11 +249,6 @@ public:
 
     /**
         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);
 
@@ -314,7 +299,15 @@ public:
     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;
 };