X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d07d2bc9d05408c58b76c53a0a291915b88e5064..5f2502393e042e6e2c871ff94b7ccaf7a78b264d:/wxPython/src/_choice.i diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i index 37492a18d6..b642a6b784 100644 --- a/wxPython/src/_choice.i +++ b/wxPython/src/_choice.i @@ -34,6 +34,8 @@ Events "); +MustHaveApp(wxChoice); + class wxChoice : public wxControlWithItems { public: @@ -49,7 +51,7 @@ public: 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", ""); @@ -68,33 +70,26 @@ public: 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", ""); - - -// // These are only meaningful on wxMotif... -// int GetColumns(); -// void SetColumns(const int n = 1); - - DocDeclStr( - void , SetSelection(const int n), - "Select the n'th item (zero based) in the list.", ""); - DocDeclStr( - bool , SetStringSelection(const wxString& string), - "Select the item with the specifed string", ""); + 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( - void , SetString(int n, const wxString& string), - "Set the label for the n'th item (zero based) in the list.", ""); - - - %pythoncode { Select = SetSelection } static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + + + %property(CurrentSelection, GetCurrentSelection, doc="See `GetCurrentSelection`"); + }; //---------------------------------------------------------------------------