fixed bug in IMP_PYCALLBACK__BOOL2DBL2INT, for #223404 in the tracker

[wxWidgets.git] / wxPython / src / helpers.h

diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h
index f53092e220ef5c496b3015fc33bd0ebc1d6865cb..6192e6e52c73fa4f80272d43d4e8220c2c49d5c9 100644 (file)
--- a/wxPython/src/helpers.h
+++ b/wxPython/src/helpers.h
@@ -137,13 +137,6 @@ extern "C" char *SWIG_GetPtrObj(PyObject *obj, void **ptr, char *type);
 # pragma warning(disable:4190)
 #endif
 
-
-
-// Non-const versions to keep SWIG happy.
-extern wxPoint  wxPyDefaultPosition;
-extern wxSize   wxPyDefaultSize;
-extern wxString wxPyEmptyStr;
-
 //----------------------------------------------------------------------
 
 class wxPyCallback : public wxObject {
@@ -323,15 +316,11 @@ public:
         bool doSave;
 #ifdef wxPyUSE_EXPORT
         doSave = wxPyCoreAPIPtr->p_wxPyRestoreThread();
-#else
-        doSave = wxPyRestoreThread();
-#endif
-
         Py_DECREF(m_obj);
-
-#ifdef wxPyUSE_EXPORT
         wxPyCoreAPIPtr->p_wxPySaveThread(doSave);
 #else
+        doSave = wxPyRestoreThread();
+        Py_DECREF(m_obj);
         wxPySaveThread(doSave);
 #endif
     }
@@ -624,8 +613,8 @@ public:
 #define IMP_PYCALLBACK__BOOL2DBL2INT(CLASS, PCLASS, CBNAME)                     \
     void CLASS::CBNAME(bool a, double b, double c, int d, int e) {              \
         bool doSave = wxPyRestoreThread();                                      \
-        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                                     \
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(idii)",                       \
+        if (wxPyCBH_findCallback(m_myInst, #CBNAME))                            \
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iddii)",             \
                                                 (int)a,b,c,d,e));               \
         else                                                                    \
             PCLASS::CBNAME(a, b, c, d, e);                                      \