X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99a49d3e6779fc1a97a3469f546d7dd580f07e3a..08f6ac314ae712e2bc8fa59cf688e6bcff76181f:/utils/wxPython/src/helpers.cpp?ds=inline

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 1ea735c8c7..863718df74 100644
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -10,14 +10,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifdef __WXGTK__
-#include <gtk/gtk.h>
-#endif
+#include <stdio.h>  // get the correct definition of NULL
 
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"
+
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 #undef FindWindow
@@ -26,7 +24,10 @@
 #undef GetClassInfo
 #undef GetClassName
 #endif
-#include <wx/module.h>
+
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#endif
 
 
 //---------------------------------------------------------------------------
@@ -74,7 +75,7 @@ wxPyApp::~wxPyApp() {
 
 // This one isn't acutally called...  See __wxStart()
 bool wxPyApp::OnInit(void) {
-    return false;
+    return FALSE;
 }
 
 int  wxPyApp::MainLoop(void) {
@@ -259,7 +260,7 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 
 //---------------------------------------------------------------------------
 
-PyObject* wxPyConstructObject(void* ptr, char* className) {
+PyObject* wxPyConstructObject(void* ptr, const char* className) {
     char    buff[64];               // should always be big enough...
     char    swigptr[64];
 
@@ -298,7 +299,7 @@ HELPEREXPORT bool wxPyRestoreThread() {
     // occurs, so I put in this code as a guard condition since there are
     // many possibilites for nested events and callbacks in wxPython.  If
     // The current thread is our thread, then we can assume that we
-    // already have the lock.
+    // already have the lock.  (I hope!)
     //
 #ifdef WXP_WITH_THREAD
     _wxPyNestCount += 1;
@@ -354,7 +355,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 
 
     bool doSave = wxPyRestoreThread();
-    arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
+    wxString className = event.GetClassInfo()->GetClassName();
+
+    if (className == "wxPyEvent")
+        arg = ((wxPyEvent*)&event)->GetSelf();
+    else if (className == "wxPyCommandEvent")
+        arg = ((wxPyCommandEvent*)&event)->GetSelf();
+    else
+        arg = wxPyConstructObject((void*)&event, className);
 
     tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);
@@ -375,12 +383,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 wxPyCallbackHelper::wxPyCallbackHelper() {
     m_self = NULL;
     m_lastFound = NULL;
+    m_incRef = FALSE;
 }
 
 
 wxPyCallbackHelper::~wxPyCallbackHelper() {
     bool doSave = wxPyRestoreThread();
-    Py_XDECREF(m_self);
+    if (m_incRef)
+        Py_XDECREF(m_self);
     wxPySaveThread(doSave);
 }
 
@@ -394,6 +404,7 @@ wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
 
 void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
     m_self = self;
+    m_incRef = incref;
     if (incref)
         Py_INCREF(m_self);
 }
@@ -436,6 +447,78 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
 
 
 
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// These classes can be derived from in Python and passed through the event
+// system without loosing anything.  They do this by keeping a reference to
+// themselves and some special case handling in wxPyCallback::EventThunker.
+
+
+wxPyEvtSelfRef::wxPyEvtSelfRef() {
+    //m_self = Py_None;         // **** We don't do normal ref counting to prevent
+    //Py_INCREF(m_self);        //      circular loops...
+    m_cloned = false;
+}
+
+wxPyEvtSelfRef::~wxPyEvtSelfRef() {
+    bool doSave = wxPyRestoreThread();
+    if (m_cloned)
+        Py_DECREF(m_self);
+    wxPySaveThread(doSave);
+}
+
+void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
+    bool doSave = wxPyRestoreThread();
+    if (m_cloned)
+        Py_DECREF(m_self);
+    m_self = self;
+    if (clone) {
+        Py_INCREF(m_self);
+        m_cloned = TRUE;
+    }
+    wxPySaveThread(doSave);
+}
+
+PyObject* wxPyEvtSelfRef::GetSelf() const {
+    Py_INCREF(m_self);
+    return m_self;
+}
+
+
+wxPyEvent::wxPyEvent(int id)
+    : wxEvent(id) {
+}
+
+wxPyEvent::~wxPyEvent() {
+}
+
+// This one is so the event object can be Cloned...
+void wxPyEvent::CopyObject(wxObject& dest) const {
+    wxEvent::CopyObject(dest);
+    ((wxPyEvent*)&dest)->SetSelf(m_self, TRUE);
+}
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxEvent);
+
+
+wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
+    : wxCommandEvent(commandType, id) {
+}
+
+wxPyCommandEvent::~wxPyCommandEvent() {
+}
+
+void wxPyCommandEvent::CopyObject(wxObject& dest) const {
+    wxCommandEvent::CopyObject(dest);
+    ((wxPyCommandEvent*)&dest)->SetSelf(m_self, TRUE);
+}
+
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyCommandEvent, wxCommandEvent);
+
+
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
@@ -474,7 +557,7 @@ void wxPyTimer::Notify() {
 //---------------------------------------------------------------------------
 // Convert a wxList to a Python List
 
-PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
+PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
     PyObject*   pyList;
     PyObject*   pyObj;
     wxObject*   wxObj;