Compilation fixes

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

diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 04eba9feb3acc957dc2ae31085ca1c45e759d63d..a512d7c07ca8af83284d395a6dd588de68d38678 100644 (file)
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpers.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        helpers.cpp

-// Purpose:     Helper functions/classes for the wxPython extenaion module
+// Purpose:     Helper functions/classes for the wxPython extension module

 //
 // Author:      Robin Dunn
 //
 //
 // Author:      Robin Dunn
 //


@@ -10,16 +10,31 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+#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 __WXGTK__
-#ifdef USE_GDK_IMLIB
-#include "gdk_imlib/gdk_imlib.h"
+#ifdef __WXMSW__
+#include <wx/msw/private.h>
+#undef FindWindow
+#undef GetCharWidth
+#undef LoadAccelerators
+#undef GetClassInfo
+#undef GetClassName

 #endif
 #endif

+
+#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
 
 #endif
 

+

 //---------------------------------------------------------------------------
 
 //wxHashTable*  wxPyWindows = NULL;
 //---------------------------------------------------------------------------
 
 //wxHashTable*  wxPyWindows = NULL;


@@ -31,6 +46,22 @@ wxString    wxPyEmptyStr("");
 
 
 
 
 
 

+#ifdef __WXMSW__             // If building for win32...
+//----------------------------------------------------------------------
+// This gets run when the DLL is loaded.  We just need to save a handle.
+//----------------------------------------------------------------------
+
+BOOL WINAPI DllMain(
+    HINSTANCE   hinstDLL,    // handle to DLL module
+    DWORD       fdwReason,   // reason for calling function
+    LPVOID      lpvReserved  // reserved
+   )
+{
+    wxSetInstance(hinstDLL);
+    return 1;
+}
+#endif
+

 //----------------------------------------------------------------------
 // Class for implementing the wxp main application shell.
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 // Class for implementing the wxp main application shell.
 //----------------------------------------------------------------------


@@ -38,47 +69,108 @@ wxString    wxPyEmptyStr("");
 wxPyApp *wxPythonApp = NULL;            // Global instance of application object
 
 
 wxPyApp *wxPythonApp = NULL;            // Global instance of application object
 
 

+wxPyApp::wxPyApp() {
+//    printf("**** ctor\n");
+}
+
+wxPyApp::~wxPyApp() {
+//    printf("**** dtor\n");
+}
+
+

 // 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 retval = wxApp::MainLoop();
 }
 
 int  wxPyApp::MainLoop(void) {
     int retval = wxApp::MainLoop();

-    AfterMainLoop();
+//#    AfterMainLoop();
+    wxPythonApp->OnExit();  //#

     return retval;
 }
 
     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))) {

 
 

-            wxPythonApp->GetTopWindow()->Close(TRUE);
-            wxPythonApp->DeletePendingObjects();
-        }
-        else {
-            delete wxPythonApp->GetTopWindow();
-            wxPythonApp->SetTopWindow(NULL);
-        }
-    }
+//#  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))) {
+
+//              wxPythonApp->GetTopWindow()->Close(TRUE);
+//              wxPythonApp->DeletePendingObjects();
+//          }
+//          else {
+//              delete wxPythonApp->GetTopWindow();
+//              wxPythonApp->SetTopWindow(NULL);
+//          }
+//      }
+//  #ifdef __WXGTK__
+//        wxPythonApp->DeletePendingObjects();
+//  #endif
+
+//      wxPythonApp->OnExit();
+//      wxApp::CleanUp();
+//  //    delete wxPythonApp;
+//  }
+
+
+//---------------------------------------------------------------------
+// a few native methods to add to the module
+//----------------------------------------------------------------------
+
+
+// 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;

 
 

-    wxPythonApp->OnExit();

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-    wxApp::CleanUp();
+    wxApp::Initialize();

 #endif
 #endif

+

 #ifdef __WXGTK__
 #ifdef __WXGTK__

-    wxApp::CommonCleanUp();
+    PyObject* sysargv = PySys_GetObject("argv");
+    int argc = PyList_Size(sysargv);
+    char** argv = new char*[argc+1];
+    int x;
+    for(x=0; x<argc; x++)
+        argv[x] = PyString_AsString(PyList_GetItem(sysargv, x));
+    argv[argc] = NULL;
+
+    gtk_set_locale();
+#if wxUSE_WCHAR_T
+    if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
+#else
+    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;

 #endif
 #endif

-    delete wxPythonApp;
+    gtk_init( &argc, &argv );
+    wxSetDetectableAutoRepeat( TRUE );
+    delete [] argv;
+
+    wxApp::Initialize();     // may return FALSE. Should we check?
+#endif
+

 }
 
 
 }
 
 

-//----------------------------------------------------------------------
-// a few native methods to add to the module
-//----------------------------------------------------------------------
+#ifdef WXP_WITH_THREAD
+PyThreadState*  wxPyEventThreadState = NULL;
+#endif
+static char* __nullArgv[1] = { 0 };
+

 
 
 // Start the user application, user App's OnInit method is a parameter here
 
 
 // Start the user application, user App's OnInit method is a parameter here


@@ -89,45 +181,30 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args)
     PyObject*   result;
     long        bResult;
 
     PyObject*   result;
     long        bResult;
 

+#ifdef WXP_WITH_THREAD
+    wxPyEventThreadState = PyThreadState_Get();
+#endif
+

     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 
     if (!PyArg_ParseTuple(args, "O", &onInitFunc))
         return NULL;
 

-    // This is where we pick up one part of the wxEntry functionality...
-    // the rest is in AfterMainLoop.
-#ifdef __WXMSW__
+    if (wxTopLevelWindows.Number() > 0) {
+        PyErr_SetString(PyExc_TypeError, "Only 1 wxApp per process!");
+        return NULL;
+    }
+
+
+    // This is the next part of the wxEntry functionality...

     wxPythonApp->argc = 0;
     wxPythonApp->argv = NULL;
     wxPythonApp->OnInitGui();
     wxPythonApp->argc = 0;
     wxPythonApp->argv = NULL;
     wxPythonApp->OnInitGui();

-#endif
-#ifdef __WXGTK__
-    wxTheApp->argc = 0;
-    wxTheApp->argv = NULL;
-
-    gtk_init( &wxTheApp->argc, &wxTheApp->argv );
-
-#ifdef USE_GDK_IMLIB
-
-    gdk_imlib_init();
-
-    gtk_widget_push_visual(gdk_imlib_get_visual());
-
-    gtk_widget_push_colormap(gdk_imlib_get_colormap());
-
-#endif
-
-    wxApp::CommonInit();
-
-    wxTheApp->OnInitGui();
-
-#endif

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

-    if (!result) {
-        PyErr_Print();
-        exit(1);
+    if (!result) {      // an exception was raised.
+        return NULL;

     }
 
     if (! PyInt_Check(result)) {
     }
 
     if (! PyInt_Check(result)) {


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

-        wxPythonApp->DeletePendingObjects();
-        wxPythonApp->OnExit();
-#ifdef __WXMSW__
-    wxApp::CleanUp();
-#endif
-#ifdef __WXGTK__
-    wxApp::CommonCleanUp();
-#endif
-        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned FALSE, exiting...");

         return NULL;
     }
 
         return NULL;
     }
 

+#ifdef __WXGTK__
+    wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
+#endif
+

     Py_INCREF(Py_None);
     return Py_None;
 }
 
 
     Py_INCREF(Py_None);
     return Py_None;
 }
 
 

-//PyObject* __wxMainLoop(PyObject* /* self */, PyObject* /* args */)
-//{
-//    wxPythonApp->MainLoop();
-//    if (wxPythonApp->wx_frame) {
-//        wxPythonApp->wx_frame->GetEventHandler()->OnClose();
-//        delete wxPythonApp->wx_frame;
-//    }
-//    wxCleanUp();
-
-//    Py_INCREF(Py_None);
-//    return Py_None;
-//}
-
-
-//PyObject* __wxExitMainLoop(PyObject* /* self */, PyObject* /* args */)
-//{
-//    wxPythonApp->ExitMainLoop();
-//    Py_INCREF(Py_None);
-//    return Py_None;
-//}
-
-
-
-//PyObject* __wxAddCallback(PyObject* /* self */, PyObject* args)
-//{
-//    char*           swigPtr;
-//    char*           name;
-//    PyObject*       callback;
-//    wxWindow*       win;
-//    wxPyEvtHandlers* evtHdlr;
-
-//    if (!PyArg_ParseTuple(args, "ssO", &swigPtr, &name, &callback))
-//        return NULL;
-
-//    if (!PyCallable_Check(callback)) {
-//        PyErr_SetString(PyExc_TypeError, "Expected a callable object.");
-//        return NULL;
-//    }
-
-//    if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) {
-//        PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow.");
-//        return NULL;
-//    }
-
-//    evtHdlr = (wxPyEvtHandlers*)win->GetClientData();
-//    if (! evtHdlr->addCallback(name, callback)) {
-//        PyErr_SetString(PyExc_TypeError, "Unknown callback name.");
-//        return NULL;
-//    }
-
-//    Py_INCREF(Py_None);
-//    return Py_None;
-//}
-
-
-
-//PyObject* __wxSetWinEvtHdlr(PyObject* /* self */, PyObject* args)
-//{
-//    char*           swigPtr;
-//    wxWindow*       win;
-//    wxPyEvtHandlers* evtHdlr;
-
-//    if (!PyArg_ParseTuple(args, "s", &swigPtr))
-//        return NULL;
-
-//    if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) {
-//        PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow.");
-//        return NULL;
-//    }
-
-//    evtHdlr = new wxPyEvtHandlers;
-//    win->SetClientData((char*)evtHdlr);
-
-//    Py_INCREF(Py_None);
-//    return Py_None;
-//}
-
-
-
-//PyObject* __wxDelWinEvtHdlr(PyObject* /* self */, PyObject* args)
-//{
-//    char*               swigPtr;
-//    wxWindow*           win;
-//    wxPyEvtHandlers*    evtHdlr;
-
-//    if (!PyArg_ParseTuple(args, "s", &swigPtr))
-//        return NULL;
-
-//    if (SWIG_GetPtr(swigPtr, (void **)&win, "_wxWindow_p")) {
-//        PyErr_SetString(PyExc_TypeError, "Expected class derived from wxWindow.");
-//        return NULL;
-//    }
-
-//    evtHdlr = (wxPyEvtHandlers*)win->GetClientData();
-//    printf("__wxDelWinEvtHdlr: %p\n", evtHdlr);
-//    delete evtHdlr;
-
-//    Py_INCREF(Py_None);
-//    return Py_None;
-//}

 
 
 
 
 
 


@@ -268,16 +241,19 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
         return NULL;
     }
 #ifdef __WXMOTIF__
         return NULL;
     }
 #ifdef __WXMOTIF__

-#define wxPlatform "__MOTIF__"
+#define wxPlatform "__WXMOTIF__"
+#endif
+#ifdef __WXQT__
+#define wxPlatform "__WXQT__"

 #endif
 #ifdef __WXGTK__
 #endif
 #ifdef __WXGTK__

-#define wxPlatform "__GTK__"
+#define wxPlatform "__WXGTK__"

 #endif
 #if defined(__WIN32__) || defined(__WXMSW__)
 #endif
 #if defined(__WIN32__) || defined(__WXMSW__)

-#define wxPlatform "__WIN32__"
+#define wxPlatform "__WXMSW__"

 #endif
 #ifdef __WXMAC__
 #endif
 #ifdef __WXMAC__

-#define wxPlatform "__MAC__"
+#define wxPlatform "__WXMAC__"

 #endif
 
     PyDict_SetItemString(wxPython_dict, "wxPlatform", PyString_FromString(wxPlatform));
 #endif
 
     PyDict_SetItemString(wxPython_dict, "wxPlatform", PyString_FromString(wxPlatform));


@@ -289,11 +265,8 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args)
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-
-static
-PyObject* wxPyConstructObject(void* ptr, char* className)
-{
-    char    buff[64];               // should be big enough...
+PyObject* wxPyConstructObject(void* ptr, const char* className) {
+    char    buff[64];               // should always be big enough...

     char    swigptr[64];
 
     sprintf(buff, "_%s_p", className);
     char    swigptr[64];
 
     sprintf(buff, "_%s_p", className);


@@ -313,6 +286,69 @@ PyObject* wxPyConstructObject(void* ptr, char* className)
     return obj;
 }
 
     return obj;
 }
 

+//---------------------------------------------------------------------------
+
+static unsigned int _wxPyNestCount = 0;
+
+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
+    // 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
+    _wxPyNestCount += 1;
+    if (wxPyEventThreadState != myPyThreadState_Get()) {
+        PyEval_RestoreThread(wxPyEventThreadState);
+        return TRUE;
+    }
+    else
+#endif
+        return FALSE;
+}
+
+
+HELPEREXPORT void wxPySaveThread(bool doSave) {
+#ifdef WXP_WITH_THREAD
+    if (doSave) {
+        wxPyEventThreadState = PyEval_SaveThread();
+    }
+    _wxPyNestCount -= 1;
+#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);
+}
+
+

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


@@ -322,12 +358,20 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       arg;
     PyObject*       tuple;
 
     PyObject*       arg;
     PyObject*       tuple;
 

-    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);
     result = PyEval_CallObject(func, tuple);
 
     tuple = PyTuple_New(1);
     PyTuple_SET_ITEM(tuple, 0, arg);
     result = PyEval_CallObject(func, tuple);

-    Py_DECREF(arg);

     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);
     Py_DECREF(tuple);
     if (result) {
         Py_DECREF(result);


@@ -335,47 +379,154 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     } else {
         PyErr_Print();
     }
     } else {
         PyErr_Print();
     }

+    wxPySaveThread(doSave);

 }
 
 
 }
 
 

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

 
 

-#ifdef __WXMSW__
-wxPyMenu::wxPyMenu(const wxString& title, PyObject* _func)
-    : wxMenu(title, (wxFunction)(func ? MenuCallback : NULL)), func(0) {
+wxPyCallbackHelper::wxPyCallbackHelper() {
+    m_self = NULL;
+    m_lastFound = NULL;
+    m_incRef = FALSE;
+}

 
 

-    if (_func) {
-        func = _func;
-        Py_INCREF(func);
-    }
+
+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);

 }
 
 }
 

-wxPyMenu::~wxPyMenu() {
-    if (func)
-        Py_DECREF(func);
+
+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;

 
 

-void wxPyMenu::MenuCallback(wxMenu& menu, wxCommandEvent& evt) {
-    PyObject* evtobj  = wxPyConstructObject((void*)&evt, "wxCommandEvent");
-    PyObject* menuobj = wxPyConstructObject((void*)&menu, "wxMenu");
-    if (PyErr_Occurred()) {
-        // bail out if a problem
+    result = PyEval_CallObject(m_lastFound, argTuple);
+    Py_DECREF(argTuple);
+    if (!result) {

         PyErr_Print();
         PyErr_Print();

-        return;

     }
     }

-    // Now call the callback...
-    PyObject* func = ((wxPyMenu*)&menu)->func;
-    PyObject* args = Py_BuildValue("(OO)", menuobj, evtobj);
-    PyObject* res  = PyEval_CallObject(func, args);
-    Py_DECREF(args);
-    Py_DECREF(res);
-    Py_DECREF(evtobj);
-    Py_DECREF(menuobj);
+    return result;

 }
 }

-#endif

 
 

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

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

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

 
 wxPyTimer::wxPyTimer(PyObject* callback) {
     func = callback;
 
 wxPyTimer::wxPyTimer(PyObject* callback) {
     func = callback;


@@ -383,10 +534,14 @@ wxPyTimer::wxPyTimer(PyObject* callback) {
 }
 
 wxPyTimer::~wxPyTimer() {
 }
 
 wxPyTimer::~wxPyTimer() {

+    bool doSave = wxPyRestoreThread();

     Py_DECREF(func);
     Py_DECREF(func);

+    wxPySaveThread(doSave);

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

+    bool doSave = wxPyRestoreThread();
+

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


@@ -398,386 +553,78 @@ void wxPyTimer::Notify() {
     } else {
         PyErr_Print();
     }
     } else {
         PyErr_Print();
     }

+    wxPySaveThread(doSave);

 }
 
 
 
 }
 
 
 

-//----------------------------------------------------------------------
-// wxPyEvtHandlers class
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+// Convert a wxList to a Python List
+
+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;
+}
+

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

-//wxPyEvtHandlers::wxPyEvtHandlers()
-//    :   pyOnActivate(0),
-//        pyOnChar(0),
-//        pyOnCharHook(0),
-//        pyOnClose(0),
-//        pyOnCommand(0),
-//        pyOnDropFiles(0),
-//        pyOnDefaultAction(0),
-//        pyOnEvent(0),
-//        pyOnInitMenuPopup(0),
-//        pyOnKillFocus(0),
-//        pyOnMenuCommand(0),
-//        pyOnMenuSelect(0),
-//        pyOnMove(0),
-//        pyOnPaint(0),
-//        pyOnScroll(0),
-//        pyOnSetFocus(0),
-//        pyOnSize(0),
-//        pyOnSysColourChange(0),
-//        pyOnLeftClick(0),
-//        pyOnMouseEnter(0),
-//        pyOnRightClick(0),
-//        pyOnDoubleClickSash(0),
-//        pyOnUnsplit(0)
-//{
-//}
-
-
-//wxPyEvtHandlers::~wxPyEvtHandlers()
-//{
-//    Py_XDECREF(pyOnActivate);
-//    Py_XDECREF(pyOnChar);
-//    Py_XDECREF(pyOnCharHook);
-//    Py_XDECREF(pyOnClose);
-//    Py_XDECREF(pyOnCommand);
-//    Py_XDECREF(pyOnDropFiles);
-//    Py_XDECREF(pyOnDefaultAction);
-//    Py_XDECREF(pyOnEvent);
-//    Py_XDECREF(pyOnInitMenuPopup);
-//    Py_XDECREF(pyOnKillFocus);
-//    Py_XDECREF(pyOnMenuCommand);
-//    Py_XDECREF(pyOnMenuSelect);
-//    Py_XDECREF(pyOnMove);
-//    Py_XDECREF(pyOnPaint);
-//    Py_XDECREF(pyOnScroll);
-//    Py_XDECREF(pyOnSetFocus);
-//    Py_XDECREF(pyOnSize);
-//    Py_XDECREF(pyOnSysColourChange);
-//    Py_XDECREF(pyOnLeftClick);
-//    Py_XDECREF(pyOnMouseEnter);
-//    Py_XDECREF(pyOnRightClick);
-//    Py_XDECREF(pyOnDoubleClickSash);
-//    Py_XDECREF(pyOnUnsplit);
-
-//    wxNode* node = cleanupList.First();
-//    while (node) {
-//        delete (wxPyEvtHandlers*)node->Data();
-//        delete node;
-//        node = cleanupList.First();
-//    }
-
-//    node = decrefList.First();
-//    while (node) {
-//        PyObject* obj = (PyObject*)node->Data();
-//        Py_DECREF(obj);
-//        delete node;
-//        node = decrefList.First();
-//    }
-////    printf("~wxPyEvtHandlers: %p\n", this);
-//}
-
-////----------------------------------------------------------------------
-
-//Bool wxPyEvtHandlers::addCallback(char* name, PyObject* callback)
-//{
-//    Py_INCREF(callback);
-
-//    if (strcmp(name, "OnActivate") == 0) {
-//        pyOnActivate = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnChar") == 0) {
-//        pyOnChar = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnCharHook") == 0) {
-//        pyOnCharHook = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnClose") == 0) {
-//        pyOnClose = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnCommand") == 0) {
-//        pyOnCommand = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnDropFiles") == 0) {
-//        pyOnDropFiles = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnDefaultAction") == 0) {
-//        pyOnDefaultAction = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnEvent") == 0) {
-//        pyOnEvent = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnInitMenuPopup") == 0) {
-//        pyOnInitMenuPopup = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnKillFocus") == 0) {
-//        pyOnKillFocus = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnMenuCommand") == 0) {
-//        pyOnMenuCommand = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnMenuSelect") == 0) {
-//        pyOnMenuSelect = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnMove") == 0) {
-//        pyOnMove = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnPaint") == 0) {
-//        pyOnPaint = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnScroll") == 0) {
-//        pyOnScroll = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnSetFocus") == 0) {
-//        pyOnSetFocus = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnSize") == 0) {
-//        pyOnSize = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnSysColourChange") == 0) {
-//        pyOnSysColourChange = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnLeftClick") == 0) {
-//        pyOnLeftClick = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnMouseEnter") == 0) {
-//        pyOnMouseEnter = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnRightClick") == 0) {
-//        pyOnRightClick = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnDoubleClickSash") == 0) {
-//        pyOnDoubleClickSash = callback;
-//        return TRUE;
-//    }
-//    if (strcmp(name, "OnUnsplit") == 0) {
-//        pyOnUnsplit = callback;
-//        return TRUE;
-//    }
-
-//    // If we get here, there was no match.
-//    Py_DECREF(callback);
-//    return FALSE;
-//}
-
-
-////----------------------------------------------------------------------
-//// Helpers to assist in calling the python callable objects
-////----------------------------------------------------------------------
-
-//PyObject* wxPyEvtHandlers::constructObject(void* ptr, char* className)
-//{
-//    char    buff[64];               // should be big enough...
-//    char    swigptr[64];
-
-//    sprintf(buff, "_%s_p", className);
-//    SWIG_MakePtr(swigptr, ptr, buff);
-
-//    sprintf(buff, "%sPtr", className);
-//    PyObject* classobj = PyDict_GetItemString(wxPython_dict, buff);
-//    PyObject* arg = Py_BuildValue("(s)", swigptr);
-//    PyObject* obj = PyInstance_New(classobj, arg, NULL);
-//    Py_DECREF(arg);
-
-//    return obj;
-//}
-
-
-
-//int wxPyEvtHandlers::callFunc(PyObject* func, PyObject* arglist)
-//{
-//    PyObject*   result;
-//    int         retval = FALSE;
-
-//    result = PyEval_CallObject(func, arglist);
-//    Py_DECREF(arglist);
-//    if (result) {                       // Assumes an integer return type...
-//        retval = PyInt_AsLong(result);
-//        Py_DECREF(result);
-//        PyErr_Clear();                  // forget about it if it's not...
-//    } else {
-//        PyErr_Print();
-//    }
-//    return retval;
-//}
-
-////---------------------------------------------------------------------------
-//// Methods and helpers of the wxPy* classes
-////---------------------------------------------------------------------------
-
-//IMP_OnActivate(wxFrame, wxPyFrame);
-//IMP_OnCharHook(wxFrame, wxPyFrame);
-//IMP_OnClose(wxFrame, wxPyFrame);
-//IMP_OnMenuCommand(wxFrame, wxPyFrame);
-//IMP_OnMenuSelect(wxFrame, wxPyFrame);
-//IMP_OnSize(wxFrame, wxPyFrame);
-//IMP_OnDropFiles(wxFrame, wxPyFrame);
-
-//IMP_OnChar(wxCanvas, wxPyCanvas);
-//IMP_OnEvent(wxCanvas, wxPyCanvas);
-//IMP_OnPaint(wxCanvas, wxPyCanvas);
-//IMP_OnScroll(wxCanvas, wxPyCanvas);
-//IMP_OnDropFiles(wxCanvas, wxPyCanvas);
-
-//IMP_OnChar(wxPanel, wxPyPanel);
-//IMP_OnEvent(wxPanel, wxPyPanel);
-//IMP_OnPaint(wxPanel, wxPyPanel);
-//IMP_OnScroll(wxPanel, wxPyPanel);
-//IMP_OnCommand(wxPanel, wxPyPanel);
-//IMP_OnDefaultAction(wxPanel, wxPyPanel);
-//IMP_OnDropFiles(wxPanel, wxPyPanel);
-
-//IMP_OnChar(wxTextWindow, wxPyTextWindow);
-//IMP_OnDropFiles(wxTextWindow, wxPyTextWindow);
-
-//IMP_OnCharHook(wxDialogBox, wxPyDialogBox);
-//IMP_OnClose(wxDialogBox, wxPyDialogBox);
-//IMP_OnSize(wxDialogBox, wxPyDialogBox);
-//IMP_OnDropFiles(wxDialogBox, wxPyDialogBox);
-//IMP_OnChar(wxDialogBox, wxPyDialogBox);
-//IMP_OnEvent(wxDialogBox, wxPyDialogBox);
-//IMP_OnPaint(wxDialogBox, wxPyDialogBox);
-//IMP_OnScroll(wxDialogBox, wxPyDialogBox);
-//IMP_OnCommand(wxDialogBox, wxPyDialogBox);
-//IMP_OnDefaultAction(wxDialogBox, wxPyDialogBox);
-
-//IMP_OnChar(wxToolBar, wxPyToolBar);
-//IMP_OnEvent(wxToolBar, wxPyToolBar);
-//IMP_OnPaint(wxToolBar, wxPyToolBar);
-//IMP_OnScroll(wxToolBar, wxPyToolBar);
-//IMP_OnCommand(wxToolBar, wxPyToolBar);
-//IMP_OnDefaultAction(wxToolBar, wxPyToolBar);
-//IMP_OnDropFiles(wxToolBar, wxPyToolBar);
-//IMP_OnMouseEnter(wxToolBar, wxPyToolBar);
-//IMP_OnRightClick(wxToolBar, wxPyToolBar);
-
-//IMP_OnChar(wxButtonBar, wxPyButtonBar);
-//IMP_OnEvent(wxButtonBar, wxPyButtonBar);
-//IMP_OnPaint(wxButtonBar, wxPyButtonBar);
-//IMP_OnScroll(wxButtonBar, wxPyButtonBar);
-//IMP_OnCommand(wxButtonBar, wxPyButtonBar);
-//IMP_OnDefaultAction(wxButtonBar, wxPyButtonBar);
-//IMP_OnDropFiles(wxButtonBar, wxPyButtonBar);
-//IMP_OnMouseEnter(wxButtonBar, wxPyButtonBar);
-//IMP_OnRightClick(wxButtonBar, wxPyButtonBar);
-
-//IMP_OnDoubleClickSash(wxSplitterWindow, wxPySplitterWindow);
-//IMP_OnUnsplit(wxSplitterWindow, wxPySplitterWindow);
-
-
-
-//Bool wxPyToolBar::OnLeftClick(int a, int b) {
-//    wxPyEvtHandlers* peh=(wxPyEvtHandlers*)GetClientData();
-//    if (peh->pyOnLeftClick)
-//        return peh->callFunc(peh->pyOnLeftClick, Py_BuildValue("(ii)",a,b));
-//    else {
-//        // If there is no Python callback, redirect the request to
-//        // the OnMenuCommand of the parent frame.
-//        wxFrame* frame = (wxFrame*)GetParent();
-//        frame->OnMenuCommand(a);
-//        return TRUE;
-//    }
-////    else
-////        return wxToolBar::OnLeftClick(a,b);
-//}
-//Bool wxPyToolBar::baseclass_OnLeftClick(int a, int b) {
-//    return wxToolBar::OnLeftClick(a,b);
-//}
-
-
-//Bool wxPyButtonBar::OnLeftClick(int a, int b) {
-//    wxPyEvtHandlers* peh=(wxPyEvtHandlers*)GetClientData();
-//    if (peh->pyOnLeftClick)
-//        return peh->callFunc(peh->pyOnLeftClick, Py_BuildValue("(ii)",a,b));
-//    else {
-//        // If there is no Python callback, redirect the request to
-//        // the OnMenuCommand of the parent frame.
-//        wxFrame* frame = (wxFrame*)GetParent();
-//        frame->OnMenuCommand(a);
-//        return TRUE;
-//    }
-//}
-//Bool wxPyButtonBar::baseclass_OnLeftClick(int a, int b) {
-//    return wxButtonBar::OnLeftClick(a,b);
-//}
-
-
-
-//wxPyMenu::wxPyMenu(PyObject* _func)
-//    : wxMenu(NULL, (wxFunction)(func ? MenuCallback : NULL)), func(0) {
-
-//    if (_func) {
-//        func = _func;
-//        Py_INCREF(func);
-//    }
-//}
-
-//wxPyMenu::~wxPyMenu() {
-//    if (func)
-//        Py_DECREF(func);
-//}
-
-
-//void wxPyMenu::MenuCallback(wxWindow& win, wxCommandEvent& evt) {
-//    wxPyEvtHandlers* peh= new wxPyEvtHandlers;  // Used for the helper methods
-//    PyObject* evtobj = peh->constructObject((void*)&evt, "wxCommandEvent");
-//    PyObject* winobj = peh->constructObject((void*)&win, "wxWindow");
-//    if (PyErr_Occurred()) {
-//        // bail out if a problem
-//        PyErr_Print();
-//        delete peh;
-//        return;
-//    }
-//    // Now call the callback...
-//    PyObject* func = ((wxPyMenu*)&win)->func;
-//    peh->callFunc(func, Py_BuildValue("(OO)", winobj, evtobj));
-//    Py_DECREF(evtobj);
-//    Py_DECREF(winobj);
-//    delete peh;
-//}
-
-
-
-//wxPyTimer::wxPyTimer(PyObject* callback) {
-//    func = callback;
-//    Py_INCREF(func);
-//}
-
-//wxPyTimer::~wxPyTimer() {
-//    Py_DECREF(func);
-//}
-
-//void wxPyTimer::Notify() {
-//    wxPyEvtHandlers* peh= new wxPyEvtHandlers;  // just for the helper methods
-//    peh->callFunc(func, Py_BuildValue("()"));
-//    delete peh;
-//}
+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
 //----------------------------------------------------------------------
 // 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) {
+    if (!PyList_Check(source)) {
+        PyErr_SetString(PyExc_TypeError, "Expected a list object.");
+        return NULL;
+    }
+    int count = PyList_Size(source);
+    byte* temp = new byte[count];
+    if (! temp) {
+        PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array");
+        return NULL;
+    }
+    for (int x=0; x<count; x++) {
+        PyObject* o = PyList_GetItem(source, x);
+        if (! PyInt_Check(o)) {
+            PyErr_SetString(PyExc_TypeError, "Expected a list of integers.");
+            return NULL;
+        }
+        temp[x] = (byte)PyInt_AsLong(o);
+    }
+    return temp;
+}

 
 
 int* int_LIST_helper(PyObject* source) {
 
 
 int* int_LIST_helper(PyObject* source) {


@@ -863,22 +710,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;


@@ -901,10 +747,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;
             }


@@ -943,7 +788,6 @@ wxString* wxString_LIST_helper(PyObject* source) {
 }
 
 
 }
 
 

-#ifdef __WXMSW__

 wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");
 wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
     if (!PyList_Check(source)) {
         PyErr_SetString(PyExc_TypeError, "Expected a list object.");


@@ -957,10 +801,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;
             }


@@ -983,87 +826,115 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
     return temp;
 }
 
     return temp;
 }
 

-#endif
+

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

-// A WinMain for when wxWindows and Python are linked together in a single
-// application, instead of as a dynamic module

 
 

+bool wxSize_helper(PyObject* source, wxSize** obj) {

 
 

-//#if !defined(WIN_PYD) && defined(WIN32)
+    // 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;
+    }

 
 

-//extern "C" int Py_Main(int argc, char** argv);
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxSize object.");
+    return FALSE;
+}

 
 

-//int APIENTRY WinMain(HANDLE hInstance, HANDLE hPrevInstance, LPSTR m_lpCmdLine,
-//                    int nCmdShow )
-//{
+bool wxPoint_helper(PyObject* source, wxPoint** obj) {

 
 

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

 
 

-//        // Initialize wxWindows, but don't start the main loop
-//    wxEntry(hInstance, hPrevInstance, m_lpCmdLine, nCmdShow, FALSE);
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of integers or a wxPoint object.");
+    return FALSE;
+}

 
 

-//    Py_Initialize();
-//    PyObject *argvList = PyList_New(0);

 
 

-//    char*   stderrfilename = "wxpstderr.log";
-//    int     pyargc = 1;
-//    char*   script = NULL;
-//    int     argc = wxPythonApp->argc;
-//    char**  argv = wxPythonApp->argv;

 
 

-//    for (int i = 1; i < argc; i++) {
-//        if (strncmp(argv[i], "wxpstderr=", 10) == 0)
-//            stderrfilename = argv[i]+10;
-//        else {
-//            PyList_Append(argvList, PyString_FromString(argv[i]));
-//            if (!script)
-//                script = argv[i];
-//            pyargc++;
-//        }
-//    }
+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;
+}
+

 
 

-//    PySys_SetObject("argv", argvList);

 
 

-//#if 1
-//    char buf[256];
-////    //PyRun_SimpleString("import sys; sys.stdout=open('wxpstdout.log','w')");
-//    sprintf(buf, "import sys; sys.stdout=sys.stderr=open('%s','w')", stderrfilename);
-//    PyRun_SimpleString(buf);
-//#endif

 
 

-//    initwxPythonc();
+bool wxRect_helper(PyObject* source, wxRect** obj) {

 
 

-//    if (script) {
-//        FILE *fp = fopen(script, "r");
-//        if (fp) {
-//            PyRun_SimpleFile(fp, script);// This returns after wxpApp constructor
-//            fclose(fp);
-//        }
-//        else {
-//            char msg[256];
-//            sprintf(msg, "Cannot open %s", script);
-//            wxMessageBox(msg);
-//        }
-//    }
-//    else
-//        PyRun_SimpleString("import wxpide");
+    // 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 0;
-//}
+ error:
+    PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
+    return FALSE;
+}

 
 
 
 

-//#endif

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

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

 
 

-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.2  1998/08/14 23:36:36  RD
-// Beginings of wxGTK compatibility
-//
-// Revision 1.1  1998/08/09 08:25:51  RD
-// Initial version
-//
-//