warning fix

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

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index a957574d2adb476ca92abb41f76c4d3dc88202bc..64326a0c32662aa8852ec7367613c141e5f3c68d 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -34,14 +34,15 @@ class wxControl : public wxWindow
 public:
     %pythonAppend wxControl         "self._setOORInfo(self)"
     %pythonAppend wxControl()       ""
+    %typemap(out) wxControl*;    // turn off this typemap
 
     DocCtorStr(
         wxControl(wxWindow *parent,
-              wxWindowID id=-1,
-              const wxPoint& pos=wxDefaultPosition,
-              const wxSize& size=wxDefaultSize,
-              long style=0,
-              const wxValidator& validator=wxDefaultValidator,
+                  wxWindowID id=-1,
+                  const wxPoint& pos=wxDefaultPosition,
+                  const wxSize& size=wxDefaultSize,
+                  long style=0,
+                  const wxValidator& validator=wxDefaultValidator,
                   const wxString& name=wxPyControlNameStr),
         "Create a Control.  Normally you should only call this from a subclass'
 __init__ as a plain old wx.Control is not very useful.", "");
@@ -51,6 +52,10 @@ __init__ as a plain old wx.Control is not very useful.", "");
         "Precreate a Control control for 2-phase creation", "",
         PreControl);
 
+    // Turn it back on again
+    %typemap(out) wxControl* { $result = wxPyMake_wxObject($1, $owner); }
+
+
     DocDeclStr(
         bool , Create(wxWindow *parent,
                       wxWindowID id=-1,
@@ -101,11 +106,13 @@ __init__ as a plain old wx.Control is not very useful.", "");
 %newgroup;
 
 
+
+
 DocStr(wxItemContainer,
-"wx.ItemContainer defines an interface which is implemented by all
-controls which have string subitems, each of which may be selected,
-such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well as
-`wx.ComboBox` which implements an extended interface deriving from
+"The wx.ItemContainer class defines an interface which is implemented
+by all controls which have string subitems, each of which may be
+selected, such as `wx.ListBox`, `wx.CheckListBox`, `wx.Choice` as well
+as `wx.ComboBox` which implements an extended interface deriving from
 this one.
 
 It defines the methods for accessing the control's items and although
@@ -119,7 +126,7 @@ optionally, client data associated with them.
 class wxItemContainer
 {
 public:
-    // wxItemContainer() { m_clientDataItemsType = wxClientData_None; }  ** It's an ABC
+    // wxItemContainer()  ** It's an ABC
     
 
     %extend {
@@ -137,8 +144,9 @@ has wx.LB_SORT or wx.CB_SORT style).", "");
         }
     }
     
-    DocDeclStrName(
+    DocDeclAStrName(
         void , Append(const wxArrayString& strings),
+        "AppendItems(self, List strings)",
         "Apend several items at once to the control.  Notice that calling this
 method may be much faster than appending the items one by one if you
 need to add a lot of items.", "",
@@ -172,6 +180,31 @@ than the number of items in the control.", "");
     
 
 
+    
+     %extend {
+        DocStr(GetClientData,
+               "Returns the client data associated with the given item, (if any.)", "");
+        PyObject* GetClientData(int n) {
+            wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
+            if (data) {
+                Py_INCREF(data->m_obj);
+                return data->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+
+        DocStr(SetClientData,
+               "Associate the given client data with the item at position n.", "");
+        void SetClientData(int n, PyObject* clientData) {
+            wxPyClientData* data = new wxPyClientData(clientData);
+            self->SetClientObject(n, data);
+        }
+    }
+
+
+    
     DocDeclStr(
         virtual int , GetCount() const,
         "Returns the number of items in the control.", "");
@@ -199,12 +232,9 @@ zero-based position of the item, or ``wx.NOT_FOUND`` if the string was not
 found.", "");
     
 
-    
     DocDeclStr(
-        virtual void , Select(int n),
+        virtual void , SetSelection(int n),
         "Sets the item at index 'n' to be the selected item.", "");
-
-    %pythoncode { SetSelection = Select }
     
     DocDeclStr(
         virtual int , GetSelection() const,
@@ -212,35 +242,21 @@ found.", "");
 is selected.", "");
     
 
+    bool SetStringSelection(const wxString& s);
+
     DocDeclStr(
         wxString , GetStringSelection() const,
         "Returns the label of the selected item or an empty string if no item
 is selected.", "");
     
 
+    DocDeclStr(
+        void , Select(int n),
+        "This is the same as `SetSelection` and exists only because it is
+slightly more natural for controls which support multiple selection.", "");
+    
 
-    %extend {
-        DocStr(GetClientData,
-               "Returns the client data associated with the given item, (if any.)", "");
-        PyObject* GetClientData(int n) {
-            wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
-            if (data) {
-                Py_INCREF(data->m_obj);
-                return data->m_obj;
-            } else {
-                Py_INCREF(Py_None);
-                return Py_None;
-            }
-        }
-
-        DocStr(SetClientData,
-               "Associate the given client data with the item at position n.", "");
-        void SetClientData(int n, PyObject* clientData) {
-            wxPyClientData* data = new wxPyClientData(clientData);
-            self->SetClientObject(n, data);
-        }
-    }
-      
+    
 };