Avoid crash in SelectAll if there are no nodes besides the root

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

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index fa5deae4cac57288ed0dc3de3cd0c2800dbcc214..365dda2c5a3e33cb2db503752a10b68f60307fa3 100644 (file)
--- a/wxPython/src/_choice.i
+++ b/wxPython/src/_choice.i
@@ -24,7 +24,7 @@ MAKE_CONST_WXSTRING(ChoiceNameStr);
 DocStr(wxChoice,       
 "A Choice control is used to select one of a list of strings.
 Unlike a `wx.ListBox`, only the selection is visible until the
 DocStr(wxChoice,       
 "A Choice control is used to select one of a list of strings.
 Unlike a `wx.ListBox`, only the selection is visible until the

-user pulls down the menu of choices.
+user pulls down the menu of choices.", "

 
 Events
 ------
 
 Events
 ------


@@ -34,14 +34,14 @@ Events
 ");
        
 
 ");
        
 

+MustHaveApp(wxChoice);
+

 class wxChoice : public wxControlWithItems
 {
 public:
     %pythonAppend wxChoice         "self._setOORInfo(self)"
     %pythonAppend wxChoice()       ""
 
 class wxChoice : public wxControlWithItems
 {
 public:
     %pythonAppend wxChoice         "self._setOORInfo(self)"
     %pythonAppend wxChoice()       ""
 

-    RefDoc(wxChoice, ""); // turn it off for the ctors
-    

     DocCtorAStr(
         wxChoice(wxWindow *parent, wxWindowID id=-1,
                  const wxPoint& pos = wxDefaultPosition,
     DocCtorAStr(
         wxChoice(wxWindow *parent, wxWindowID id=-1,
                  const wxPoint& pos = wxDefaultPosition,


@@ -51,13 +51,13 @@ 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",
     String name=ChoiceNameStr) -> Choice",

-        "Create and show a Choice control");
+        "Create and show a Choice control", "");

 
     DocCtorStrName(
         wxChoice(),
 
     DocCtorStrName(
         wxChoice(),

-        "Precreate a Choice control for 2-phase creation.",
+        "Precreate a Choice control for 2-phase creation.", "",

         PreChoice);
                 
 
         PreChoice);
                 
 


@@ -70,30 +70,22 @@ 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",
     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);
-
+        "Actually create the GUI Choice control for 2-phase creation", "");

 
     DocDeclStr(
 
     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");
-    
-    DocDeclStr(
-        void , SetString(int n, const wxString& string),
-        "Set the label for the n'th item (zero based) in the list.");
+        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.", "");

     
 
     
 

-    %pythoncode { Select = SetSelection }
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

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