Committing in .

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

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 1cd1d149374c6ecd27d6dfb697326ddc4b9c39de..9a32b7fc273fae92d90cb02d1881ab2b0b4b23c6 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,18 @@
 #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>
+
+extern GtkWidget *wxRootWindow;
+
+#endif

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


@@ -74,64 +83,49 @@ 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) {

-    int retval = wxApp::MainLoop();
-//#    AfterMainLoop();
-    wxPythonApp->OnExit();  //#
-    return retval;
-}
-
-
-//#  void wxPyApp::AfterMainLoop(void) {
-//      // more stuff from wxEntry...
-
-//      if (wxPythonApp->GetTopWindow()) {
-//          // Forcibly delete the window.
-//          if (wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) ||
-//              wxPythonApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) {
+    int retval = 0;

 
 

-//              wxPythonApp->GetTopWindow()->Close(TRUE);
-//              wxPythonApp->DeletePendingObjects();
-//          }
-//          else {
-//              delete wxPythonApp->GetTopWindow();
-//              wxPythonApp->SetTopWindow(NULL);
-//          }
-//      }
-//  #ifdef __WXGTK__
-//        wxPythonApp->DeletePendingObjects();
-//  #endif
+    DeletePendingObjects();
+#ifdef __WXGTK__
+    m_initialized = wxTopLevelWindows.GetCount() != 0;
+#endif

 
 

-//      wxPythonApp->OnExit();
-//      wxApp::CleanUp();
-//  //    delete wxPythonApp;
-//  }
+    if (Initialized()) {
+        retval = wxApp::MainLoop();
+        wxPythonApp->OnExit();
+    }
+    return retval;
+}

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

-// a few native methods to add to the module

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

+int  WXDLLEXPORT wxEntryStart( int argc, char** argv );
+int  WXDLLEXPORT wxEntryInitGui();
+void WXDLLEXPORT wxEntryCleanup();
+

 
 // This is where we pick up the first part of the wxEntry functionality...
 // The rest is in __wxStart and  AfterMainLoop.  This function is called when
 // wxcmodule is imported.  (Before there is a wxApp object.)
 void __wxPreStart()
 {
 
 // This is where we pick up the first part of the wxEntry functionality...
 // The rest is in __wxStart and  AfterMainLoop.  This function is called when
 // 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.
     if (wxTopLevelWindows.Number() > 0)
         return;
 
     // 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.
     if (wxTopLevelWindows.Number() > 0)
         return;
 

-#ifdef __WXMSW__
-    wxApp::Initialize();
-#endif

 
 

-#ifdef __WXGTK__

     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);
     char** argv = new char*[argc+1];
     PyObject* sysargv = PySys_GetObject("argv");
     int argc = PyList_Size(sysargv);
     char** argv = new char*[argc+1];


@@ -140,21 +134,13 @@ void __wxPreStart()
         argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
     argv[argc] = NULL;
 
         argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
     argv[argc] = NULL;
 

-    gtk_set_locale();
-    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
-    gtk_init( &argc, &argv );
-    wxSetDetectableAutoRepeat( TRUE );
-    delete [] argv;
-
-    wxApp::Initialize();     // may return FALSE. Should we check?
-#endif
-
+    wxEntryStart(argc, argv);

 }
 
 
 }
 
 

+

 #ifdef WXP_WITH_THREAD
 PyThreadState*  wxPyEventThreadState = NULL;
 #ifdef WXP_WITH_THREAD
 PyThreadState*  wxPyEventThreadState = NULL;

-bool            wxPyInEvent = false;

 #endif
 static char* __nullArgv[1] = { 0 };
 
 #endif
 static char* __nullArgv[1] = { 0 };
 


@@ -184,8 +170,8 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     // This is the next part of the wxEntry functionality...
     wxPythonApp->argc = 0;
     wxPythonApp->argv = NULL;
     // This is the next part of the wxEntry functionality...
     wxPythonApp->argc = 0;
     wxPythonApp->argv = NULL;

-    wxPythonApp->OnInitGui();

 
 

+    wxEntryInitGui();

 
     // Call the Python App's OnInit function
     arglist = PyTuple_New(0);
 
     // Call the Python App's OnInit function
     arglist = PyTuple_New(0);


@@ -200,19 +186,21 @@ 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;
     }
 
 #ifdef __WXGTK__
         return NULL;
     }
 
 #ifdef __WXGTK__

-    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+    wxTheApp->m_initialized = (wxTopLevelWindows.GetCount() > 0);

 #endif
 
     Py_INCREF(Py_None);
     return Py_None;
 }
 
 #endif
 
     Py_INCREF(Py_None);
     return Py_None;
 }
 

-
+void __wxCleanup() {
+    wxEntryCleanup();
+}

 
 
 
 
 
 


@@ -252,8 +240,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,27 +261,67 @@ PyObject* wxPyConstructObject(void* ptr, char* className)
     return obj;
 }
 
     return obj;
 }
 

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

 
 

+static unsigned int _wxPyNestCount = 0;

 
 

-wxPyCallback::wxPyCallback(PyObject* func) {
-    m_func = func;
-    Py_INCREF(m_func);
+static PyThreadState* myPyThreadState_Get() {
+    PyThreadState* current;
+    current = PyThreadState_Swap(NULL);
+    PyThreadState_Swap(current);
+    return current;

 }
 
 }
 

-wxPyCallback::~wxPyCallback() {
+
+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
+    // 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!)
+    //

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

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

         PyEval_RestoreThread(wxPyEventThreadState);
         PyEval_RestoreThread(wxPyEventThreadState);

+        return TRUE;
+    }
+    else

 #endif
 #endif

+        return FALSE;
+}

 
 

-    Py_DECREF(m_func);

 
 

+HELPEREXPORT void wxPySaveThread(bool doSave) {

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

-    //if (! wxPyInEvent)
-        PyEval_SaveThread();
+    if (doSave) {
+        wxPyEventThreadState = PyEval_SaveThread();
+    }
+    _wxPyNestCount -= 1;

 #endif
 }
 
 #endif
 }
 

+//---------------------------------------------------------------------------
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxPyCallback, wxObject);
+
+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);
+    wxPySaveThread(doSave);
+}

 
 
 
 
 
 


@@ -307,11 +334,15 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       tuple;
 
 
     PyObject*       tuple;
 
 

-#ifdef WXP_WITH_THREAD
-    PyEval_RestoreThread(wxPyEventThreadState);
-    wxPyInEvent = true;
-#endif
-    arg = wxPyConstructObject((void*)&event, event.GetClassInfo()->GetClassName());
+    bool doSave = wxPyRestoreThread();
+    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);


@@ -323,101 +354,169 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     } else {
         PyErr_Print();
     }
     } else {
         PyErr_Print();
     }

-#ifdef WXP_WITH_THREAD
-    PyEval_SaveThread();
-    wxPyInEvent = false;
-#endif
+    wxPySaveThread(doSave);
+}
+
+
+//----------------------------------------------------------------------
+
+wxPyCallbackHelper::wxPyCallbackHelper() {
+    m_self = NULL;
+    m_lastFound = NULL;
+    m_incRef = FALSE;
+}
+
+
+wxPyCallbackHelper::~wxPyCallbackHelper() {
+    bool doSave = wxPyRestoreThread();
+    if (m_incRef)
+        Py_XDECREF(m_self);
+    wxPySaveThread(doSave);
+}
+
+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_incRef = incref;
+    if (incref)
+        Py_INCREF(m_self);
+}
+
+
+bool wxPyCallbackHelper::findCallback(const wxString& name) {
+    m_lastFound = NULL;
+    if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str()))
+        m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str());
+
+    return m_lastFound != NULL;

 }
 
 
 }
 
 

+int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
+    PyObject*   result;
+    int         retval = FALSE;
+
+    result = callCallbackObj(argTuple);
+    if (result) {                       // Assumes an integer return type...
+        retval = PyInt_AsLong(result);
+        Py_DECREF(result);
+        PyErr_Clear();                  // forget about it if it's not...
+    }
+    return retval;
+}
+
+// Invoke the Python callable object, returning the raw PyObject return
+// value.  Caller should DECREF the return value and also call PyEval_SaveThread.
+PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
+    PyObject*   result;
+
+    result = PyEval_CallObject(m_lastFound, argTuple);
+    Py_DECREF(argTuple);
+    if (!result) {
+        PyErr_Print();
+    }
+    return result;
+}
+
+
+

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

+//---------------------------------------------------------------------------
+// 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.
+

 
 

-//  wxPyMenu::wxPyMenu(const wxString& title, PyObject* _func)
-//      : wxMenu(title, (wxFunction)(func ? MenuCallback : NULL)), func(0) {
-
-//      if (_func) {
-//          func = _func;
-//          Py_INCREF(func);
-//      }
-//  }
-
-//  wxPyMenu::~wxPyMenu() {
-//  #ifdef WXP_WITH_THREAD
-//      //if (! wxPyInEvent)
-//          PyEval_RestoreThread(wxPyEventThreadState);
-//  #endif
-
-//      if (func)
-//          Py_DECREF(func);
-
-//  #ifdef WXP_WITH_THREAD
-//      //if (! wxPyInEvent)
-//          PyEval_SaveThread();
-//  #endif
-//  }
-
-
-//  void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
-//      PyObject* evtobj;
-//      PyObject* menuobj;
-//      PyObject* func;
-//      PyObject* args;
-//      PyObject* res;
-
-//  #ifdef WXP_WITH_THREAD
-//      PyEval_RestoreThread(wxPyEventThreadState);
-//      wxPyInEvent = true;
-//  #endif
-//      evtobj  = wxPyConstructObject((void*)&evt, "wxCommandEvent");
-//      menuobj = wxPyConstructObject((void*)&menu, "wxMenu");
-//      if (PyErr_Occurred()) {
-//          // bail out if a problem
-//          PyErr_Print();
-//          goto done;
-//      }
-//      // Now call the callback...
-//      func = ((wxPyMenu*)&menu)->func;
-//      args = PyTuple_New(2);
-//      PyTuple_SET_ITEM(args, 0, menuobj);
-//      PyTuple_SET_ITEM(args, 1, evtobj);
-//      res  = PyEval_CallObject(func, args);
-//      Py_DECREF(args);
-//      Py_XDECREF(res); /* In case res is a NULL pointer */
-//   done:
-//  #ifdef WXP_WITH_THREAD
-//      PyEval_SaveThread();
-//      wxPyInEvent = false;
-//  #endif
-//      return;
-//  }
+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);
+
+
+
+//---------------------------------------------------------------------------

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

+

 wxPyTimer::wxPyTimer(PyObject* callback) {
     func = callback;
     Py_INCREF(func);
 }
 
 wxPyTimer::~wxPyTimer() {
 wxPyTimer::wxPyTimer(PyObject* callback) {
     func = callback;
     Py_INCREF(func);
 }
 
 wxPyTimer::~wxPyTimer() {

-#ifdef WXP_WITH_THREAD
-    //if (! wxPyInEvent)
-        PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-
+    bool doSave = wxPyRestoreThread();

     Py_DECREF(func);
     Py_DECREF(func);

-
-#ifdef WXP_WITH_THREAD
-    //if (! wxPyInEvent)
-        PyEval_SaveThread();
-#endif
+    wxPySaveThread(doSave);

 }
 
 void wxPyTimer::Notify() {
 }
 
 void wxPyTimer::Notify() {

-#ifdef WXP_WITH_THREAD
-    PyEval_RestoreThread(wxPyEventThreadState);
-    wxPyInEvent = true;
-#endif
+    bool doSave = wxPyRestoreThread();
+

     PyObject*   result;
     PyObject*   args = Py_BuildValue("()");
 
     PyObject*   result;
     PyObject*   args = Py_BuildValue("()");
 


@@ -429,63 +528,55 @@ void wxPyTimer::Notify() {
     } else {
         PyErr_Print();
     }
     } else {
         PyErr_Print();
     }

-#ifdef WXP_WITH_THREAD
-    PyEval_SaveThread();
-    wxPyInEvent = false;
-#endif
+    wxPySaveThread(doSave);

 }
 
 
 }
 
 

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

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxPyEvent, wxCommandEvent)
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// Convert a wxList to a Python List

 
 

-wxPyEvent::wxPyEvent(wxEventType commandType, PyObject* userData)
-    : wxCommandEvent(commandType), m_userData(Py_None)
-{
-    m_userData = userData;
-    if (m_userData != Py_None) {
-        Py_INCREF(m_userData);
+PyObject* wxPy_ConvertList(wxListBase* list, const char* className) {
+    PyObject*   pyList;
+    PyObject*   pyObj;
+    wxObject*   wxObj;
+    wxNode*     node = list->First();
+
+    bool doSave = wxPyRestoreThread();
+    pyList = PyList_New(0);
+    while (node) {
+        wxObj = node->Data();
+        pyObj = wxPyConstructObject(wxObj, className);
+        PyList_Append(pyList, pyObj);
+        node = node->Next();

     }
     }

+    wxPySaveThread(doSave);
+    return pyList;

 }
 
 }
 

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

 
 

-wxPyEvent::~wxPyEvent() {
-#ifdef WXP_WITH_THREAD
-    //if (! wxPyInEvent)
-        PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-    if (m_userData != Py_None) {
-        Py_DECREF(m_userData);
-        m_userData = Py_None;
-    }
-#ifdef WXP_WITH_THREAD
-    //if (! wxPyInEvent)
-        PyEval_SaveThread();
+long wxPyGetWinHandle(wxWindow* win) {
+#ifdef __WXMSW__
+    return (long)win->GetHandle();

 #endif
 #endif

-}
-

 
 

-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);
+    // 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;

 }
 
 }
 

-
-PyObject* wxPyEvent::GetUserData() {
-    return m_userData;
-}
-
-//----------------------------------------------------------------------

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

-// imcluded in every file...
+// included in every file...

 
 
 byte* byte_LIST_helper(PyObject* source) {
 
 
 byte* byte_LIST_helper(PyObject* source) {


@@ -594,22 +685,21 @@ wxPoint* wxPoint_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);
-            wxPoint*    pt;
-            if (SWIG_GetPtr(st,(void **) &pt,"_wxPoint_p")) {
-                PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
-                return NULL;
-            }
-            temp[x] = *pt;
-        }
-        else if (PyTuple_Check(o)) {
+        if (PyTuple_Check(o)) {

             PyObject* o1 = PyTuple_GetItem(o, 0);
             PyObject* o2 = PyTuple_GetItem(o, 1);
 
             temp[x].x = PyInt_AsLong(o1);
             temp[x].y = PyInt_AsLong(o2);
         }
             PyObject* o1 = PyTuple_GetItem(o, 0);
             PyObject* o2 = PyTuple_GetItem(o, 1);
 
             temp[x].x = PyInt_AsLong(o1);
             temp[x].y = PyInt_AsLong(o2);
         }

+        else if (PyInstance_Check(o)) {
+            wxPoint* pt;
+            if (SWIG_GetPtrObj(o,(void **) &pt,"_wxPoint_p")) {
+                PyErr_SetString(PyExc_TypeError,"Expected _wxPoint_p.");
+                return NULL;
+            }
+            temp[x] = *pt;
+        }

         else {
             PyErr_SetString(PyExc_TypeError, "Expected a list of 2-tuples or wxPoints.");
             return NULL;
         else {
             PyErr_SetString(PyExc_TypeError, "Expected a list of 2-tuples or wxPoints.");
             return NULL;


@@ -632,10 +722,9 @@ 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;
             }


@@ -687,10 +776,9 @@ 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;
             }


@@ -715,75 +803,107 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
 
 
 
 
 
 

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

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

-wxPyCallbackHelper::wxPyCallbackHelper() {
-    m_self = NULL;
-    m_lastFound = NULL;
-}
+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;
+    }

 
 

-wxPyCallbackHelper::~wxPyCallbackHelper() {
-#ifdef WXP_WITH_THREAD
-    PyEval_RestoreThread(wxPyEventThreadState);
-#endif
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
+    return FALSE;
+}

 
 

-    Py_XDECREF(m_self);
+bool wxPoint_helper(PyObject* source, wxPoint** obj) {

 
 

-#ifdef WXP_WITH_THREAD
-    PyEval_SaveThread();
-#endif
-}
+    // 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;
+    }

 
 

-void wxPyCallbackHelper::setSelf(PyObject* self) {
-    m_self = self;
-    Py_INCREF(m_self);
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
+    return FALSE;

 }
 
 
 
 }
 
 
 

-bool wxPyCallbackHelper::findCallback(const wxString& name) {
-    m_lastFound = NULL;
-    if (m_self && PyObject_HasAttrString(m_self, (char*)name.c_str()))
-        m_lastFound = PyObject_GetAttrString(m_self, (char*)name.c_str());
+bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {

 
 

-    return m_lastFound != NULL;
+    // 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;

 }
 
 
 }
 
 

-int wxPyCallbackHelper::callCallback(PyObject* argTuple) {
-    PyObject*   result;
-    int         retval = FALSE;

 
 

-    result = callCallbackObj(argTuple);
-    if (result) {                       // Assumes an integer return type...
-        retval = PyInt_AsLong(result);
-        Py_DECREF(result);
-        PyErr_Clear();                  // forget about it if it's not...
-    }
-#ifdef WXP_WITH_THREAD
-    PyEval_SaveThread();
-#endif
-    return retval;
-}

 
 

-// Invoke the Python callable object, returning the raw PyObject return
-// value.  Caller should DECREF the return value and also call PyEval_SaveThread.
-PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) {
-#ifdef WXP_WITH_THREAD
-    PyEval_RestoreThread(wxPyEventThreadState);
-#endif
-    PyObject*   result;
+bool wxRect_helper(PyObject* source, wxRect** obj) {

 
 

-    result = PyEval_CallObject(m_lastFound, argTuple);
-    Py_DECREF(argTuple);
-    if (!result) {
-        PyErr_Print();
+    // 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;

     }
     }

-    return result;
-}

 
 

+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
+    return FALSE;
+}