wxCheckListBox doesn't require wxUSE_OWNER_DRAWN when using WXUNIVERSAL

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

diff --git a/wxPython/src/_evthandler.i b/wxPython/src/_evthandler.i
index 2fed5cab97515c1a902c6e3ff1df36153730635e..d54c5aa1eb71c90fa49c13022224b007aa94b4a0 100644 (file)
--- a/wxPython/src/_evthandler.i
+++ b/wxPython/src/_evthandler.i
@@ -19,8 +19,14 @@
 // wxEvtHandler: the base class for all objects handling wxWindows events
 class wxEvtHandler : public wxObject {
 public:
 // wxEvtHandler: the base class for all objects handling wxWindows events
 class wxEvtHandler : public wxObject {
 public:

+    // turn off this typemap
+    %typemap(out) wxEvtHandler*;    
+

     wxEvtHandler();
 
     wxEvtHandler();
 

+    // Turn it back on again
+    %typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
+

     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);
     wxEvtHandler* GetNextHandler();
     wxEvtHandler* GetPreviousHandler();
     void SetNextHandler(wxEvtHandler* handler);


@@ -67,9 +73,9 @@ public:
     }
 
     %extend {
     }
 
     %extend {

-        void _setOORInfo(PyObject* _self) {
+        void _setOORInfo(PyObject* _self, bool incref=true) {

             if (_self && _self != Py_None) {
             if (_self && _self != Py_None) {

-                self->SetClientObject(new wxPyOORClientData(_self));
+                self->SetClientObject(new wxPyOORClientData(_self, incref));

             }
             else {
                 wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();
             }
             else {
                 wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();


@@ -85,22 +91,27 @@ public:
             """
             Bind an event to an event handler.
 
             """
             Bind an event to an event handler.
 

-              event     One of the EVT_* objects that specifies the
-                        type of event to bind,
+            :param event: One of the EVT_* objects that specifies the
+                          type of event to bind,
+
+            :param handler: A callable object to be invoked when the
+                          event is delivered to self.  Pass None to
+                          disconnect an event handler.

 
 

-              handler   A callable object to be invoked when the event
-                        is delivered to self.  Pass None to disconnect an
-                        event handler.
+            :param source: Sometimes the event originates from a
+                          different window than self, but you still
+                          want to catch it in self.  (For example, a
+                          button event delivered to a frame.)  By
+                          passing the source of the event, the event
+                          handling system is able to differentiate
+                          between the same event type from different
+                          controls.

 
 

-              source    Sometimes the event originates from a different window
-                        than self, but you still want to catch it in self.  (For
-                        example, a button event delivered to a frame.)  By
-                        passing the source of the event, the event handling
-                        system is able to differentiate between the same event
-                        type from different controls.
+            :param id: Used to spcify the event source by ID instead
+                       of instance.

 
 

-              id,id2    Used for menu IDs or for event types that require a
-                        range of IDs
+            :param id2: Used when it is desirable to bind a handler
+                          to a range of IDs, such as with EVT_MENU_RANGE.

             """
             if source is not None:
                 id  = source.GetId()
             """
             if source is not None:
                 id  = source.GetId()