Oops, CenteronScreen wasn't really removed, just moved to wxTopLevelWindow

[wxWidgets.git] / wxPython / src / _combobox.i

diff --git a/wxPython/src/_combobox.i b/wxPython/src/_combobox.i
index 8ee9435d0879a428a01fbd3a843ad169a4b49b70..d842914b93de0665f2e8eb5efe71f4c9f5b20ffe 100644 (file)
--- a/wxPython/src/_combobox.i
+++ b/wxPython/src/_combobox.i
@@ -83,7 +83,7 @@ public:
                    const wxString& name = wxPyComboBoxNameStr),
         "__init__(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
                    const wxString& name = wxPyComboBoxNameStr),
         "__init__(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,

-    List choices=[], long style=0, Validator validator=DefaultValidator,
+    List choices=EmptyList, long style=0, Validator validator=DefaultValidator,

     String name=ComboBoxNameStr) -> ComboBox",
         "Constructor, creates and shows a ComboBox control.", "");
 
     String name=ComboBoxNameStr) -> ComboBox",
         "Constructor, creates and shows a ComboBox control.", "");
 


@@ -104,7 +104,7 @@ public:
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, String value=EmptyString,
     Point pos=DefaultPosition, Size size=DefaultSize,

-    List choices=[], long style=0, Validator validator=DefaultValidator,
+    List choices=EmptyList, long style=0, Validator validator=DefaultValidator,

     String name=ChoiceNameStr) -> bool",
         "Actually create the GUI wxComboBox control for 2-phase creation", "");
     
     String name=ChoiceNameStr) -> bool",
         "Actually create the GUI wxComboBox control for 2-phase creation", "");
     


@@ -166,6 +166,15 @@ the combobox text field.", "",
         GetMark);
 #endif
 
         GetMark);
 #endif
 

+    DocDeclStr(
+        int , GetCurrentSelection() const,
+        "Unlike `GetSelection` which only returns the accepted selection value,
+i.e. the selection in the control once the user closes the dropdown
+list, this function returns the current selection.  That is, while the
+dropdown list is shown, it returns the currently selected item in
+it. When it is not shown, its result is the same as for the other
+function.", "");
+    

     DocDeclStr(
         bool , SetStringSelection(const wxString& string),
         "Select the item with the specifed string", "");
     DocDeclStr(
         bool , SetStringSelection(const wxString& string),
         "Select the item with the specifed string", "");