Committing in .

[wxWidgets.git] / utils / wxPython / src / helpers.cpp

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index d73f04007dc77c6d9768c58fc2ad7009cb0ed50c..863718df74b5f4e05f7267957678da20b8ec9b1a 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -10,14 +10,12 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 #undef DEBUG
 #include <Python.h>
 #include "helpers.h"

+

 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 #undef FindWindow
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 #undef FindWindow


@@ -26,7 +24,10 @@
 #undef GetClassInfo
 #undef GetClassName
 #endif
 #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) {
 
 // This one isn't acutally called...  See __wxStart()
 bool wxPyApp::OnInit(void) {

-    return false;
+    return FALSE;

 }
 
 int  wxPyApp::MainLoop(void) {
 }
 
 int  wxPyApp::MainLoop(void) {


@@ -382,12 +383,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 wxPyCallbackHelper::wxPyCallbackHelper() {
     m_self = NULL;
     m_lastFound = NULL;
 wxPyCallbackHelper::wxPyCallbackHelper() {
     m_self = NULL;
     m_lastFound = NULL;

+    m_incRef = FALSE;

 }
 
 
 wxPyCallbackHelper::~wxPyCallbackHelper() {
     bool doSave = wxPyRestoreThread();
 }
 
 
 wxPyCallbackHelper::~wxPyCallbackHelper() {
     bool doSave = wxPyRestoreThread();

-    Py_XDECREF(m_self);
+    if (m_incRef)
+        Py_XDECREF(m_self);

     wxPySaveThread(doSave);
 }
 
     wxPySaveThread(doSave);
 }
 


@@ -401,6 +404,7 @@ wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
 
 void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
     m_self = self;
 
 void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {
     m_self = self;

+    m_incRef = incref;

     if (incref)
         Py_INCREF(m_self);
 }
     if (incref)
         Py_INCREF(m_self);
 }


@@ -450,20 +454,20 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
 // themselves and some special case handling in wxPyCallback::EventThunker.
 
 
 // themselves and some special case handling in wxPyCallback::EventThunker.
 
 

-wxPySelfRef::wxPySelfRef() {
+wxPyEvtSelfRef::wxPyEvtSelfRef() {

     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
     m_cloned = false;
 }
 
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
     m_cloned = false;
 }
 

-wxPySelfRef::~wxPySelfRef() {
+wxPyEvtSelfRef::~wxPyEvtSelfRef() {

     bool doSave = wxPyRestoreThread();
     if (m_cloned)
         Py_DECREF(m_self);
     wxPySaveThread(doSave);
 }
 
     bool doSave = wxPyRestoreThread();
     if (m_cloned)
         Py_DECREF(m_self);
     wxPySaveThread(doSave);
 }
 

-void wxPySelfRef::SetSelf(PyObject* self, bool clone) {
+void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {

     bool doSave = wxPyRestoreThread();
     if (m_cloned)
         Py_DECREF(m_self);
     bool doSave = wxPyRestoreThread();
     if (m_cloned)
         Py_DECREF(m_self);


@@ -475,7 +479,7 @@ void wxPySelfRef::SetSelf(PyObject* self, bool clone) {
     wxPySaveThread(doSave);
 }
 
     wxPySaveThread(doSave);
 }
 

-PyObject* wxPySelfRef::GetSelf() const {
+PyObject* wxPyEvtSelfRef::GetSelf() const {

     Py_INCREF(m_self);
     return m_self;
 }
     Py_INCREF(m_self);
     return m_self;
 }