Oops

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

diff --git a/wxPython/src/_choice.i b/wxPython/src/_choice.i
index de2bc68844ca1f455080020e5a9f32f41a2954a4..a071e49e9c8fcac78e64a2654d79696b671f559f 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
-user pulls down the menu of choices.
+user pulls down the menu of choices.", "
 
 Events
 ------
@@ -34,14 +34,14 @@ Events
 ");
        
 
+MustHaveApp(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,
@@ -53,11 +53,11 @@ public:
         "__init__(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
     List choices=[], long style=0, Validator validator=DefaultValidator,
     String name=ChoiceNameStr) -> Choice",
-        "Create and show a Choice control");
+        "Create and show a Choice control", "");
 
     DocCtorStrName(
         wxChoice(),
-        "Precreate a Choice control for 2-phase creation.",
+        "Precreate a Choice control for 2-phase creation.", "",
         PreChoice);
                 
 
@@ -72,29 +72,9 @@ public:
         "Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
     List choices=[], long style=0, Validator validator=DefaultValidator,
     String name=ChoiceNameStr) -> bool",
-        "Actually create the GUI Choice control for 2-phase creation");
+        "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");
-    
-    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);
 };