Compilation fixes

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

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 547dde92b327b2948a3a5e52c4c604cf582ca804..a512d7c07ca8af83284d395a6dd588de68d38678 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,15 @@
 #undef GetClassInfo
 #undef GetClassName
 #endif
 #undef GetClassInfo
 #undef GetClassName
 #endif

-#include <wx/module.h>
+
+#ifdef __WXGTK__
+#include <gtk/gtk.h>
+#include <gdk/gdkprivate.h>
+#include <wx/gtk/win_gtk.h>
+//#include <gdk/gdk.h>
+//#include <gdk/gdkx.h>
+//#include <gtk/gtkwindow.h>
+#endif

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -74,7 +80,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) {


@@ -121,6 +127,10 @@ int  wxPyApp::MainLoop(void) {
 // wxcmodule is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {
 // wxcmodule is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {

+#ifdef WXP_WITH_THREAD
+    PyEval_InitThreads();
+#endif
+

     // Bail out if there is already windows created.  This means that the
     // toolkit has already been initialized, as in embedding wxPython in
     // a C++ wxWindows app.
     // Bail out if there is already windows created.  This means that the
     // toolkit has already been initialized, as in embedding wxPython in
     // a C++ wxWindows app.


@@ -141,7 +151,11 @@ void __wxPreStart()
     argv[argc] = NULL;
 
     gtk_set_locale();
     argv[argc] = NULL;
 
     gtk_set_locale();

+#if wxUSE_WCHAR_T

     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;

+#else
+    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif

     gtk_init( &argc, &argv );
     wxSetDetectableAutoRepeat( TRUE );
     delete [] argv;
     gtk_init( &argc, &argv );
     wxSetDetectableAutoRepeat( TRUE );
     delete [] argv;


@@ -199,7 +213,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {
     }
     bResult = PyInt_AS_LONG(result);
     if (! bResult) {

-        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");

         return NULL;
     }
 
         return NULL;
     }
 


@@ -251,7 +265,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];
 
     char    buff[64];               // should always be big enough...
     char    swigptr[64];
 


@@ -274,36 +288,30 @@ PyObject* wxPyConstructObject(void* ptr, char* className) {
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-//static bool _wxPyInEvent = false;

 static unsigned int _wxPyNestCount = 0;
 
 static unsigned int _wxPyNestCount = 0;
 

-HELPEREXPORT bool wxPyRestoreThread() {
-//  #ifdef WXP_WITH_THREAD
-//      //if (wxPyEventThreadState != PyThreadState_Get()) {
-//      if (! _wxPyInEvent) {
-//          PyEval_RestoreThread(wxPyEventThreadState);
-//          _wxPyInEvent = true;
-//          return TRUE;
-//      } else
-//  #endif
-//          return FALSE;
+static PyThreadState* myPyThreadState_Get() {
+    PyThreadState* current;
+    current = PyThreadState_Swap(NULL);
+    PyThreadState_Swap(current);
+    return current;
+}

 
 

+
+HELPEREXPORT bool wxPyRestoreThread() {

     // NOTE: The Python API docs state that if a thread already has the
     // interpreter lock and calls PyEval_RestoreThread again a deadlock
     // NOTE: The Python API docs state that if a thread already has the
     // interpreter lock and calls PyEval_RestoreThread again a deadlock

-    // occurs, so I put in the above code as a guard condition since there are
-    // many possibilites for nested events and callbacks in wxPython.
+    // 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.  (I hope!)

     //
     //

-    // Unfortunately, it seems like somebody was lying (or I'm not
-    // understanding...) because each of the nested calls to this function
-    // MUST call PyEval_RestoreThread or Python pukes with a thread error (at
-    // least on Win32.)
-    //
-    // until I know better, this is how I am doing it instead:

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

-    PyEval_RestoreThread(wxPyEventThreadState);

     _wxPyNestCount += 1;
     _wxPyNestCount += 1;

-    if (_wxPyNestCount == 1)
+    if (wxPyEventThreadState != myPyThreadState_Get()) {
+        PyEval_RestoreThread(wxPyEventThreadState);

         return TRUE;
         return TRUE;

+    }

     else
 #endif
         return FALSE;
     else
 #endif
         return FALSE;


@@ -313,8 +321,7 @@ HELPEREXPORT bool wxPyRestoreThread() {
 HELPEREXPORT void wxPySaveThread(bool doSave) {
 #ifdef WXP_WITH_THREAD
     if (doSave) {
 HELPEREXPORT void wxPySaveThread(bool doSave) {
 #ifdef WXP_WITH_THREAD
     if (doSave) {

-        PyEval_SaveThread();
-        //_wxPyInEvent = false;
+        wxPyEventThreadState = PyEval_SaveThread();

     }
     _wxPyNestCount -= 1;
 #endif
     }
     _wxPyNestCount -= 1;
 #endif


@@ -323,11 +330,18 @@ HELPEREXPORT void wxPySaveThread(bool doSave) {
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
+

 wxPyCallback::wxPyCallback(PyObject* func) {
     m_func = func;
     Py_INCREF(m_func);
 }
 
 wxPyCallback::wxPyCallback(PyObject* func) {
     m_func = func;
     Py_INCREF(m_func);
 }
 

+wxPyCallback::wxPyCallback(const wxPyCallback& other) {
+    m_func = other.m_func;
+    Py_INCREF(m_func);
+}
+

 wxPyCallback::~wxPyCallback() {
     bool doSave = wxPyRestoreThread();
     Py_DECREF(m_func);
 wxPyCallback::~wxPyCallback() {
     bool doSave = wxPyRestoreThread();
     Py_DECREF(m_func);


@@ -336,7 +350,6 @@ wxPyCallback::~wxPyCallback() {
 
 
 
 
 
 

-

 // This function is used for all events destined for Python event handlers.
 void wxPyCallback::EventThunker(wxEvent& event) {
     wxPyCallback*   cb = (wxPyCallback*)event.m_callbackUserData;
 // This function is used for all events destined for Python event handlers.
 void wxPyCallback::EventThunker(wxEvent& event) {
     wxPyCallback*   cb = (wxPyCallback*)event.m_callbackUserData;


@@ -347,7 +360,14 @@ void wxPyCallback::EventThunker(wxEvent& event) {
 
 
     bool doSave = wxPyRestoreThread();
 
 
     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);
 
     tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);


@@ -368,18 +388,30 @@ 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);
 }
 

-void wxPyCallbackHelper::setSelf(PyObject* self) {
+wxPyCallbackHelper::wxPyCallbackHelper(const wxPyCallbackHelper& other) {
+      m_lastFound = NULL;
+      m_self = other.m_self;
+      if (m_self)
+          Py_INCREF(m_self);
+}
+
+
+void wxPyCallbackHelper::setSelf(PyObject* self, int incref) {

     m_self = self;
     m_self = self;

-    Py_INCREF(m_self);
+    m_incRef = incref;
+    if (incref)
+        Py_INCREF(m_self);

 }
 
 
 }
 
 


@@ -420,6 +452,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);
+
+
+

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 


@@ -453,51 +557,12 @@ void wxPyTimer::Notify() {
 }
 
 
 }
 
 

-//----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxCommandEvent)
-
-wxPyEvent::wxPyEvent(wxEventType commandType, PyObject* userData)
-    : wxCommandEvent(commandType), m_userData(Py_None)
-{
-    m_userData = userData;
-    if (m_userData != Py_None) {
-        Py_INCREF(m_userData);
-    }
-}
-
-
-wxPyEvent::~wxPyEvent() {
-    bool doSave = wxPyRestoreThread();
-    if (m_userData != Py_None) {
-        Py_DECREF(m_userData);
-        m_userData = Py_None;
-    }
-    wxPySaveThread(doSave);
-}
-
-
-void wxPyEvent::SetUserData(PyObject* userData) {
-    if (m_userData != Py_None) {
-        Py_DECREF(m_userData);
-        m_userData = Py_None;
-    }
-    m_userData = userData;
-    if (m_userData != Py_None) {
-        Py_INCREF(m_userData);
-    }
-}
-
-
-PyObject* wxPyEvent::GetUserData() {
-    return m_userData;
-}

 
 

-//----------------------------------------------------------------------
+//---------------------------------------------------------------------------

 //---------------------------------------------------------------------------
 // Convert a wxList to a Python List
 
 //---------------------------------------------------------------------------
 // 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;
     PyObject*   pyList;
     PyObject*   pyObj;
     wxObject*   wxObj;


@@ -515,12 +580,31 @@ PyObject* wxPy_ConvertList(wxListBase* list, char* className) {
     return pyList;
 }
 
     return pyList;
 }
 

+//----------------------------------------------------------------------
+
+long wxPyGetWinHandle(wxWindow* win) {
+#ifdef __WXMSW__
+    return (long)win->GetHandle();
+#endif
+
+    // Find and return the actual X-Window.
+#ifdef __WXGTK__
+    if (win->m_wxwindow) {
+        GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
+        if (bwin) {
+            return (long)bwin->xwindow;
+        }
+    }
+#endif
+    return 0;
+}
+

 //----------------------------------------------------------------------
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file...
 
 
 //----------------------------------------------------------------------
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file...
 
 

-HELPEREXPORT byte* byte_LIST_helper(PyObject* source) {
+byte* byte_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -543,7 +627,7 @@ HELPEREXPORT byte* byte_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-HELPEREXPORT int* int_LIST_helper(PyObject* source) {
+int* int_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -566,7 +650,7 @@ HELPEREXPORT int* int_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-HELPEREXPORT long* long_LIST_helper(PyObject* source) {
+long* long_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -589,7 +673,7 @@ HELPEREXPORT long* long_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-HELPEREXPORT char** string_LIST_helper(PyObject* source) {
+char** string_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -613,7 +697,7 @@ HELPEREXPORT char** string_LIST_helper(PyObject* source) {
 
 
 
 
 
 

-HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source) {
+wxPoint* wxPoint_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -650,7 +734,7 @@ HELPEREXPORT wxPoint* wxPoint_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
+wxBitmap** wxBitmap_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -663,10 +747,9 @@ HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);

-        if (PyString_Check(o)) {
-            char*       st = PyString_AsString(o);
+        if (PyInstance_Check(o)) {

             wxBitmap*    pt;
             wxBitmap*    pt;

-            if (SWIG_GetPtr(st,(void **) &pt,"_wxBitmap_p")) {
+            if (SWIG_GetPtrObj(o, (void **) &pt,"_wxBitmap_p")) {

                 PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
                 return NULL;
             }
                 PyErr_SetString(PyExc_TypeError,"Expected _wxBitmap_p.");
                 return NULL;
             }


@@ -682,7 +765,7 @@ HELPEREXPORT wxBitmap** wxBitmap_LIST_helper(PyObject* source) {
 
 
 
 
 
 

-HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source) {
+wxString* wxString_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -705,7 +788,7 @@ HELPEREXPORT wxString* wxString_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
+wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {

     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
         return NULL;


@@ -718,10 +801,9 @@ HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);
     }
     for (int x=0; x<count; x++) {
         PyObject* o = PyList_GetItem(source, x);

-        if (PyString_Check(o)) {
-            char*               st = PyString_AsString(o);
+        if (PyInstance_Check(o)) {

             wxAcceleratorEntry* ae;
             wxAcceleratorEntry* ae;

-            if (SWIG_GetPtr(st,(void **) &ae,"_wxAcceleratorEntry_p")) {
+            if (SWIG_GetPtrObj(o, (void **) &ae,"_wxAcceleratorEntry_p")) {

                 PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
                 return NULL;
             }
                 PyErr_SetString(PyExc_TypeError,"Expected _wxAcceleratorEntry_p.");
                 return NULL;
             }


@@ -748,6 +830,108 @@ HELPEREXPORT wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+bool wxSize_helper(PyObject* source, wxSize** obj) {
+
+    // If source is an object instance then it may already be the right type
+    if (PyInstance_Check(source)) {
+        wxSize* ptr;
+        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxSize_p"))
+            goto error;
+        *obj = ptr;
+        return TRUE;
+    }
+    // otherwise a 2-tuple of integers is expected
+    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+        PyObject* o1 = PySequence_GetItem(source, 0);
+        PyObject* o2 = PySequence_GetItem(source, 1);
+        **obj = wxSize(PyInt_AsLong(o1), PyInt_AsLong(o2));
+        return TRUE;
+    }
+
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
+    return FALSE;
+}
+
+bool wxPoint_helper(PyObject* source, wxPoint** obj) {
+
+    // If source is an object instance then it may already be the right type
+    if (PyInstance_Check(source)) {
+        wxPoint* ptr;
+        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxPoint_p"))
+            goto error;
+        *obj = ptr;
+        return TRUE;
+    }
+    // otherwise a 2-tuple of integers is expected
+    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+        PyObject* o1 = PySequence_GetItem(source, 0);
+        PyObject* o2 = PySequence_GetItem(source, 1);
+        **obj = wxPoint(PyInt_AsLong(o1), PyInt_AsLong(o2));
+        return TRUE;
+    }
+
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
+    return FALSE;
+}
+
+
+
+bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
+
+    // If source is an object instance then it may already be the right type
+    if (PyInstance_Check(source)) {
+        wxRealPoint* ptr;
+        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRealPoint_p"))
+            goto error;
+        *obj = ptr;
+        return TRUE;
+    }
+    // otherwise a 2-tuple of floats is expected
+    else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
+        PyObject* o1 = PySequence_GetItem(source, 0);
+        PyObject* o2 = PySequence_GetItem(source, 1);
+        **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
+        return TRUE;
+    }
+
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
+    return FALSE;
+}
+
+
+
+
+bool wxRect_helper(PyObject* source, wxRect** obj) {
+
+    // If source is an object instance then it may already be the right type
+    if (PyInstance_Check(source)) {
+        wxRect* ptr;
+        if (SWIG_GetPtrObj(source, (void **)&ptr, "_wxRect_p"))
+            goto error;
+        *obj = ptr;
+        return TRUE;
+    }
+    // otherwise a 4-tuple of integers is expected
+    else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
+        PyObject* o1 = PySequence_GetItem(source, 0);
+        PyObject* o2 = PySequence_GetItem(source, 1);
+        PyObject* o3 = PySequence_GetItem(source, 2);
+        PyObject* o4 = PySequence_GetItem(source, 3);
+        **obj = wxRect(PyInt_AsLong(o1), PyInt_AsLong(o2),
+                     PyInt_AsLong(o3), PyInt_AsLong(o4));
+        return TRUE;
+    }
+
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
+    return FALSE;
+}
+
+
+

 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------