Don't use hidden items for size calc (patch 1698314)

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

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index a071e49e9c8fcac78e64a2654d79696b671f559f..b642a6b7841dd0289379cf76af48a594065d9122 100644 (file)
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -51,7 +51,7 @@ public:
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxPyChoiceNameStr),
         "__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxPyChoiceNameStr),
         "__init__(Window parent, int id, 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) -> Choice",
         "Create and show a Choice control", "");
 
     String name=ChoiceNameStr) -> Choice",
         "Create and show a Choice control", "");
 


@@ -70,13 +70,26 @@ public:
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
                      const wxValidator& validator = wxDefaultValidator,
                      const wxString& name = wxPyChoiceNameStr),
         "Create(Window parent, int id, 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 Choice control for 2-phase creation", "");
     String name=ChoiceNameStr) -> bool",
         "Actually create the GUI Choice control for 2-phase creation", "");

+
+    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.", "");

     
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
     
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

+
+
+    %property(CurrentSelection, GetCurrentSelection, doc="See `GetCurrentSelection`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------