]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/helpers.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Redo (again) how the stock objects are initialized in wxPython.
[wxWidgets.git] / wxPython / src / helpers.cpp
diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 628046c2afcde368af71c7d6cae23754310012b7..572ada736f85386376d76235b5dba91392773189 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -15,6 +15,8 @@
 #include <Python.h>
 #include "wx/wxPython/wxPython_int.h"
 #include "wx/wxPython/pyistream.h"
 #include <Python.h>
 #include "wx/wxPython/wxPython_int.h"
 #include "wx/wxPython/pyistream.h"
+#include "wx/wxPython/swigver.h"
+#include "wx/wxPython/twoitem.h"
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
 
 #ifdef __WXMSW__
 #include <wx/msw/private.h>
@@ -23,9 +25,20 @@
 #endif
 
 #ifdef __WXGTK__
 #endif
 
 #ifdef __WXGTK__
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkprivate.h>
 #include <wx/gtk/win_gtk.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkprivate.h>
 #include <wx/gtk/win_gtk.h>
+#define GetXWindow(wxwin) (wxwin)->m_wxwindow ? \
+                          GDK_WINDOW_XWINDOW(GTK_PIZZA((wxwin)->m_wxwindow)->bin_window) : \
+                          GDK_WINDOW_XWINDOW((wxwin)->m_widget->window)
+#include <locale.h>
+#endif
+
+#ifdef __WXX11__
+#include "wx/x11/privx.h"
+#define GetXWindow(wxwin)   ((Window)(wxwin)->GetHandle())
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__
@@ -38,25 +51,25 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
-#if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE
+#if PYTHON_API_VERSION < 1009 && wxUSE_UNICODE
 #error Python must support Unicode to use wxWindows Unicode
 #endif
 
 //----------------------------------------------------------------------
 
 wxPyApp* wxPythonApp = NULL;  // Global instance of application object
 #error Python must support Unicode to use wxWindows Unicode
 #endif
 
 //----------------------------------------------------------------------
 
 wxPyApp* wxPythonApp = NULL;  // Global instance of application object
-bool wxPyDoCleanup = False;
-bool wxPyDoingCleanup = False;
+bool wxPyDoCleanup = false;
+bool wxPyDoingCleanup = false;
 
 
 #ifdef WXP_WITH_THREAD
 
 
 #ifdef WXP_WITH_THREAD
+#if !wxPyUSE_GIL_STATE
 struct wxPyThreadState {
     unsigned long  tid;
     PyThreadState* tstate;
 struct wxPyThreadState {
     unsigned long  tid;
     PyThreadState* tstate;
-    int            blocked;
 
     wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)
 
     wxPyThreadState(unsigned long _tid=0, PyThreadState* _tstate=NULL)
-        : tid(_tid), tstate(_tstate), blocked(1) {}
+        : tid(_tid), tstate(_tstate) {}
 };
 
 #include <wx/dynarray.h>
 };
 
 #include <wx/dynarray.h>
@@ -66,11 +79,17 @@ WX_DEFINE_OBJARRAY(wxPyThreadStateArray);
 
 wxPyThreadStateArray* wxPyTStates = NULL;
 wxMutex*              wxPyTMutex = NULL;
 
 wxPyThreadStateArray* wxPyTStates = NULL;
 wxMutex*              wxPyTMutex = NULL;
+
+#endif
 #endif
 
 
 #endif
 
 
+#define DEFAULTENCODING_SIZE 64
+static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii";
+
 static PyObject* wxPython_dict = NULL;
 static PyObject* wxPyAssertionError = NULL;
 static PyObject* wxPython_dict = NULL;
 static PyObject* wxPyAssertionError = NULL;
+static PyObject* wxPyNoAppError = NULL;
 
 PyObject* wxPyPtrTypeMap = NULL;
 
 
 PyObject* wxPyPtrTypeMap = NULL;
 
@@ -80,17 +99,18 @@ PyObject* wxPyPtrTypeMap = NULL;
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------
 
 // This gets run when the DLL is loaded.  We just need to save a handle.
 //----------------------------------------------------------------------
 
+extern "C"
 BOOL WINAPI DllMain(
     HINSTANCE   hinstDLL,    // handle to DLL module
     DWORD       fdwReason,   // reason for calling function
     LPVOID      lpvReserved  // reserved
    )
 {
 BOOL WINAPI DllMain(
     HINSTANCE   hinstDLL,    // handle to DLL module
     DWORD       fdwReason,   // reason for calling function
     LPVOID      lpvReserved  // reserved
    )
 {
-    // If wxPython is embedded in another wxWindows app then
-    // the inatance has already been set.
+    // If wxPython is embedded in another wxWidgets app then
+    // the instance has already been set.
     if (! wxGetInstance())
         wxSetInstance(hinstDLL);
     if (! wxGetInstance())
         wxSetInstance(hinstDLL);
-    return True;
+    return true;
 }
 #endif
 
 }
 #endif
 
@@ -103,17 +123,19 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyApp, wxApp);
 
 wxPyApp::wxPyApp() {
     m_assertMode = wxPYAPP_ASSERT_EXCEPTION;
 
 wxPyApp::wxPyApp() {
     m_assertMode = wxPYAPP_ASSERT_EXCEPTION;
-    m_startupComplete = False;
+    m_startupComplete = false;
 }
 
 
 wxPyApp::~wxPyApp() {
 }
 
 
 wxPyApp::~wxPyApp() {
+    wxPythonApp = NULL;
+    wxApp::SetInstance(NULL);
 }
 
 
 // This one isn't acutally called...  We fake it with _BootstrapApp
 bool wxPyApp::OnInit() {
 }
 
 
 // This one isn't acutally called...  We fake it with _BootstrapApp
 bool wxPyApp::OnInit() {
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -135,27 +157,39 @@ int  wxPyApp::MainLoop() {
 
 
 bool wxPyApp::OnInitGui() {
 
 
 bool wxPyApp::OnInitGui() {
-    bool rval=True;
+    bool rval=true;
     wxApp::OnInitGui();  // in this case always call the base class version
     wxApp::OnInitGui();  // in this case always call the base class version
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return rval;
 }
 
 
 int wxPyApp::OnExit() {
     int rval=0;
     return rval;
 }
 
 
 int wxPyApp::OnExit() {
     int rval=0;
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "OnExit"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     if (wxPyCBH_findCallback(m_myInst, "OnExit"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     wxApp::OnExit();  // in this case always call the base class version
     return rval;
 }
 
 
     wxApp::OnExit();  // in this case always call the base class version
     return rval;
 }
 
 
+
+void wxPyApp::ExitMainLoop() {
+    bool found;
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if ((found = wxPyCBH_findCallback(m_myInst, "ExitMainLoop")))
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
+    wxPyEndBlockThreads(blocked);
+    if (! found)
+        wxApp::ExitMainLoop();
+}  
+
+
 #ifdef __WXDEBUG__
 void wxPyApp::OnAssert(const wxChar *file,
                      int line,
 #ifdef __WXDEBUG__
 void wxPyApp::OnAssert(const wxChar *file,
                      int line,
@@ -178,7 +212,7 @@ void wxPyApp::OnAssert(const wxChar *file,
 
     // If the OnAssert is overloaded in the Python class then call it...
     bool found;
 
     // If the OnAssert is overloaded in the Python class then call it...
     bool found;
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) {
         PyObject* fso = wx2PyString(file);
         PyObject* cso = wx2PyString(file);
     if ((found = wxPyCBH_findCallback(m_myInst, "OnAssert"))) {
         PyObject* fso = wx2PyString(file);
         PyObject* cso = wx2PyString(file);
@@ -193,7 +227,7 @@ void wxPyApp::OnAssert(const wxChar *file,
         Py_DECREF(cso);
         Py_DECREF(mso);
     }
         Py_DECREF(cso);
         Py_DECREF(mso);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 
     // ...otherwise do our own thing with it
     if (! found) {
 
     // ...otherwise do our own thing with it
     if (! found) {
@@ -212,11 +246,11 @@ void wxPyApp::OnAssert(const wxChar *file,
             }
 
             // set the exception
             }
 
             // set the exception
-            wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* s = wx2PyString(buf);
             PyErr_SetObject(wxPyAssertionError, s);
             Py_DECREF(s);
             PyObject* s = wx2PyString(buf);
             PyErr_SetObject(wxPyAssertionError, s);
             Py_DECREF(s);
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
 
             // Now when control returns to whatever API wrapper was called from
             // Python it should detect that an exception is set and will return
 
             // Now when control returns to whatever API wrapper was called from
             // Python it should detect that an exception is set and will return
@@ -247,40 +281,40 @@ void wxPyApp::OnAssert(const wxChar *file,
     // For catching Apple Events
 void wxPyApp::MacOpenFile(const wxString &fileName)
 {
     // For catching Apple Events
 void wxPyApp::MacOpenFile(const wxString &fileName)
 {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
         Py_DECREF(s);
     }
     if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
         Py_DECREF(s);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 void wxPyApp::MacPrintFile(const wxString &fileName)
 {
 }
 
 void wxPyApp::MacPrintFile(const wxString &fileName)
 {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
         Py_DECREF(s);
     }
     if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
         Py_DECREF(s);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 void wxPyApp::MacNewFile()
 {
 }
 
 void wxPyApp::MacNewFile()
 {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 void wxPyApp::MacReopenApp()
 {
 }
 
 void wxPyApp::MacReopenApp()
 {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 
 }
 
 
@@ -369,50 +403,92 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) {
 // that should be present in the derived (Python) class.
 void wxPyApp::_BootstrapApp()
 {
 // that should be present in the derived (Python) class.
 void wxPyApp::_BootstrapApp()
 {
+    static      bool haveInitialized = false;
     bool        result;
     bool        result;
+    wxPyBlock_t     blocked;
     PyObject*   retval = NULL;
     PyObject*   pyint  = NULL;
 
 
     PyObject*   retval = NULL;
     PyObject*   pyint  = NULL;
 
 
-    // Get any command-line args passed to this program from the sys module
-    int    argc = 0;
-    char** argv = NULL;
-    wxPyBeginBlockThreads();
-    PyObject* sysargv = PySys_GetObject("argv");
-    if (sysargv != NULL) {
-        argc = PyList_Size(sysargv);
-        argv = new char*[argc+1];
-        int x;
-        for(x=0; x<argc; x++) {
-            PyObject *pyArg = PyList_GetItem(sysargv, x);
-            argv[x] = PyString_AsString(pyArg);
+    // Only initialize wxWidgets once
+    if (! haveInitialized) {
+
+        // Get any command-line args passed to this program from the sys module
+        int    argc = 0;
+        char** argv = NULL;
+        blocked = wxPyBeginBlockThreads();
+        
+        PyObject* sysargv = PySys_GetObject("argv");
+        PyObject* executable = PySys_GetObject("executable");
+        
+        if (sysargv != NULL && executable != NULL) {
+            argc = PyList_Size(sysargv) + 1;
+            argv = new char*[argc+1];
+            argv[0] = strdup(PyString_AsString(executable));
+            int x;
+            for(x=1; x<argc; x++) {
+                PyObject *pyArg = PyList_GetItem(sysargv, x-1);
+                argv[x] = strdup(PyString_AsString(pyArg));
+            }
+            argv[argc] = NULL;
         }
         }
-        argv[argc] = NULL;
-    }
-    wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
 
 
-    result = wxEntryStart(argc, argv);
-    delete [] argv;
+        // Initialize wxWidgets
+        result = wxEntryStart(argc, argv);
+        // wxApp takes ownership of the argv array, don't delete it here
 
 
-    wxPyBeginBlockThreads();
-    if (! result)  {
-        PyErr_SetString(PyExc_SystemError, "wxEntryStart failed!");
-        goto error;
-    }
+        blocked = wxPyBeginBlockThreads();
+        if (! result)  {
+            PyErr_SetString(PyExc_SystemError,
+                            "wxEntryStart failed, unable to initialize wxWidgets!"
+#ifdef __WXGTK__
+                            "  (Is DISPLAY set properly?)"
+#endif
+                );
+            goto error;
+        }
 
 
-    // The stock objects were all NULL when they were loaded into
-    // SWIG generated proxies, so re-init those now...
-    wxPy_ReinitStockObjects(3);
+        // On wxGTK the locale will be changed to match the system settings,
+        // but Python before 2.4 needs to have LC_NUMERIC set to "C" in order
+        // for the floating point conversions and such to work right.
+#if defined(__WXGTK__) && PY_VERSION_HEX < 0x02040000
+        setlocale(LC_NUMERIC, "C");
+#endif
+
+//        wxSystemOptions::SetOption(wxT("mac.textcontrol-use-mlte"), 1);
+        
+        wxPyEndBlockThreads(blocked);
+        haveInitialized = true;
+    }
+    else {
+        this->argc = 0;
+        this->argv = NULL;
+    }
+    
 
     // It's now ok to generate exceptions for assertion errors.
 
     // It's now ok to generate exceptions for assertion errors.
-    wxPythonApp->SetStartupComplete(True);
+    wxPythonApp->SetStartupComplete(true);
 
 
-    // Call the Python wxApp's OnInit function
+   
+    // Call the Python wxApp's OnPreInit and OnInit functions
+    blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "OnPreInit")) {
+        PyObject* method = m_myInst.GetLastFound();
+        PyObject* argTuple = PyTuple_New(0);
+        retval = PyEval_CallObject(method, argTuple);
+        m_myInst.clearRecursionGuard(method);
+        Py_DECREF(argTuple);
+        Py_DECREF(method);
+        if (retval == NULL)
+            goto error;
+    }
     if (wxPyCBH_findCallback(m_myInst, "OnInit")) {
 
         PyObject* method = m_myInst.GetLastFound();
         PyObject* argTuple = PyTuple_New(0);
         retval = PyEval_CallObject(method, argTuple);
     if (wxPyCBH_findCallback(m_myInst, "OnInit")) {
 
         PyObject* method = m_myInst.GetLastFound();
         PyObject* argTuple = PyTuple_New(0);
         retval = PyEval_CallObject(method, argTuple);
+        m_myInst.clearRecursionGuard(method);
         Py_DECREF(argTuple);
         Py_DECREF(method);
         if (retval == NULL)
         Py_DECREF(argTuple);
         Py_DECREF(method);
         if (retval == NULL)
@@ -427,19 +503,18 @@ void wxPyApp::_BootstrapApp()
     }
     else {
         // Is it okay if there is no OnInit?  Probably so...
     }
     else {
         // Is it okay if there is no OnInit?  Probably so...
-        result = True;
+        result = true;
     }
 
     }
 
-
     if (! result) {
     if (! result) {
-        PyErr_SetString(PyExc_SystemExit, "OnInit returned False, exiting...");
+        PyErr_SetString(PyExc_SystemExit, "OnInit returned false, exiting...");
     }
 
  error:
     Py_XDECREF(retval);
     Py_XDECREF(pyint);
 
     }
 
  error:
     Py_XDECREF(retval);
     Py_XDECREF(pyint);
 
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 };
 
 //---------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------
@@ -491,17 +566,23 @@ inline const char* dropwx(const char* name) {
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
-// This function is called when the wxc module is imported to do some initial
-// setup.  (Before there is a wxApp object.)  The rest happens in
+// This function is called when the wx._core_ module is imported to do some
+// initial setup.  (Before there is a wxApp object.)  The rest happens in
 // wxPyApp::_BootstrapApp
 void __wxPyPreStart(PyObject* moduleDict)
 {
 
 #ifdef __WXMSW__
 // wxPyApp::_BootstrapApp
 void __wxPyPreStart(PyObject* moduleDict)
 {
 
 #ifdef __WXMSW__
-//    wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF);
+//     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF
+//                     | _CRTDBG_CHECK_ALWAYS_DF
+//                     | _CRTDBG_DELAY_FREE_MEM_DF
+//         );
 #endif
 
 #ifdef WXP_WITH_THREAD
 #endif
 
 #ifdef WXP_WITH_THREAD
+#if wxPyUSE_GIL_STATE
+    PyEval_InitThreads();
+#else
     PyEval_InitThreads();
     wxPyTStates = new wxPyThreadStateArray;
     wxPyTMutex = new wxMutex;
     PyEval_InitThreads();
     wxPyTStates = new wxPyThreadStateArray;
     wxPyTMutex = new wxMutex;
@@ -509,34 +590,36 @@ void __wxPyPreStart(PyObject* moduleDict)
     // Save the current (main) thread state in our array
     PyThreadState* tstate = wxPyBeginAllowThreads();
     wxPyEndAllowThreads(tstate);
     // Save the current (main) thread state in our array
     PyThreadState* tstate = wxPyBeginAllowThreads();
     wxPyEndAllowThreads(tstate);
+#endif
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build
     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython");
 
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build
     wxApp::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, "wxPython");
 
-    // Init the stock objects to a non-NULL value so SWIG doesn't create them as None
-    wxPy_ReinitStockObjects(1);
+    wxInitAllImageHandlers();
 }
 
 
 
 void __wxPyCleanup() {
 }
 
 
 
 void __wxPyCleanup() {
-    wxPyDoingCleanup = True;
+    wxPyDoingCleanup = true;
     if (wxPyDoCleanup) {
     if (wxPyDoCleanup) {
-        wxPyDoCleanup = False;
+        wxPyDoCleanup = false;
         wxEntryCleanup();
     }
 #ifdef WXP_WITH_THREAD
         wxEntryCleanup();
     }
 #ifdef WXP_WITH_THREAD
+#if !wxPyUSE_GIL_STATE
     delete wxPyTMutex;
     wxPyTMutex = NULL;
     wxPyTStates->Empty();
     delete wxPyTStates;
     wxPyTStates = NULL;
 #endif
     delete wxPyTMutex;
     wxPyTMutex = NULL;
     wxPyTStates->Empty();
     delete wxPyTStates;
     wxPyTStates = NULL;
 #endif
+#endif
 }
 
 
 }
 
 
-// Save a reference to the dictionary of the wx.core module, and inject
+// Save a reference to the dictionary of the wx._core module, and inject
 // a few more things into it.
 PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
 {
 // a few more things into it.
 PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
 {
@@ -545,7 +628,8 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
         return NULL;
 
     if (!PyDict_Check(wxPython_dict)) {
         return NULL;
 
     if (!PyDict_Check(wxPython_dict)) {
-        PyErr_SetString(PyExc_TypeError, "_wxPySetDictionary must have dictionary object!");
+        PyErr_SetString(PyExc_TypeError,
+                        "_wxPySetDictionary must have dictionary object!");
         return NULL;
     }
 
         return NULL;
     }
 
@@ -554,10 +638,16 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
 
     // Create an exception object to use for wxASSERTions
     PyDict_SetItemString(wxPython_dict, "__wxPyPtrTypeMap", wxPyPtrTypeMap);
 
     // Create an exception object to use for wxASSERTions
-    wxPyAssertionError = PyErr_NewException("wx.core.PyAssertionError",
+    wxPyAssertionError = PyErr_NewException("wx._core.PyAssertionError",
                                             PyExc_AssertionError, NULL);
     PyDict_SetItemString(wxPython_dict, "PyAssertionError", wxPyAssertionError);
 
                                             PyExc_AssertionError, NULL);
     PyDict_SetItemString(wxPython_dict, "PyAssertionError", wxPyAssertionError);
 
+    // Create an exception object to use when the app object hasn't been created yet
+    wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError",
+                                        PyExc_RuntimeError, NULL);
+    PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError);
+
+
 
 #ifdef __WXMOTIF__
 #define wxPlatform "__WXMOTIF__"
 
 #ifdef __WXMOTIF__
 #define wxPlatform "__WXMOTIF__"
@@ -591,7 +681,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
     PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug));
 
     PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
     PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug));
 
-    
+    // Make a tuple of strings that gives more info about the platform.
     PyObject* PlatInfo = PyList_New(0);
     PyObject* obj;
 
     PyObject* PlatInfo = PyList_New(0);
     PyObject* obj;
 
@@ -605,7 +695,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
 #if wxUSE_UNICODE
     _AddInfoString("unicode");
 #else
 #if wxUSE_UNICODE
     _AddInfoString("unicode");
 #else
-    _AddInfoString("ascii");
+    _AddInfoString("ansi");
 #endif
 #ifdef __WXGTK__
 #ifdef __WXGTK20__
 #endif
 #ifdef __WXGTK__
 #ifdef __WXGTK20__
@@ -614,200 +704,63 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     _AddInfoString("gtk1");
 #endif
 #endif
     _AddInfoString("gtk1");
 #endif
 #endif
-
+#ifdef __WXDEBUG__
+    _AddInfoString("wx-assertions-on");
+#else
+    _AddInfoString("wx-assertions-off");
+#endif
+    _AddInfoString(wxPy_SWIG_VERSION);    
+    
 #undef _AddInfoString
 
     PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
     Py_DECREF(PlatInfo);
     PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
 #undef _AddInfoString
 
     PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
     Py_DECREF(PlatInfo);
     PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
-    
-    RETURN_NONE();
-}
-
-
-//---------------------------------------------------------------------------
 
 
-// Python's PyInstance_Check does not return True for instances of new-style
-// classes.  This should get close enough for both new and old classes but I
-// should re-evaluate the need for doing instance checks...
-bool wxPyInstance_Check(PyObject* obj) {
-    return PyObject_HasAttrString(obj, "__class__") != 0;
+    RETURN_NONE();
 }
 
 
 }
 
 
-// This one checks if the object is an instance of a SWIG proxy class (it has
-// a .this attribute)
-bool wxPySwigInstance_Check(PyObject* obj) {
-    return PyObject_HasAttrString(obj, "this") != 0;
-}
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 
-// The stock objects are no longer created when the wxc module is imported,
-// but only after the app object has been created.  The
-// wxPy_ReinitStockObjects function will be called 3 times to pass the stock
-// objects though various stages of evolution:
-//
-//   pass 1: Set all the pointers to a non-NULL value so the Python proxy
-//           object will be created (otherwise it will just use None.)
-//
-//   pass 2: After the module has been imported and the python proxys have
-//           been created, then set the __class__ to be _wxPyUnbornObject so
-//           it will catch any access to the object and will raise an exception.
-//
-//   pass 3: Finally, from OnInit patch things up so the stock objects can
-//           be used.
-
-
-PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args)
-{
-    wxPy_ReinitStockObjects(2);
-    RETURN_NONE();
-}
-
+// Check for existence of a wxApp, setting an exception if there isn't one.
+// This doesn't need to aquire the GIL because it should only be called from
+// an %exception before the lock is released.
 
 
-static void rsoPass2(const char* name)
-{
-    static PyObject* unbornObjectClass = NULL;
-    PyObject* obj;
-
-    if (unbornObjectClass == NULL) {
-        unbornObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyUnbornObject");
-        Py_INCREF(unbornObjectClass);
+bool wxPyCheckForApp() {
+    if (wxTheApp != NULL)
+        return true;
+    else {
+        PyErr_SetString(wxPyNoAppError, "The wx.App object must be created first!");
+        return false;
     }
     }
-
-    // Find the object instance
-    obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
-    wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
-    wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance"));
-
-    // Change its class
-    PyObject_SetAttrString(obj, "__class__",  unbornObjectClass);
-
 }
 
 }
 
-static void rsoPass3(const char* name, const char* classname, void* ptr)
-{
-    PyObject* obj;
-    PyObject* classobj;
-    PyObject* ptrobj;
-
-    // Find the object instance
-    obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
-    wxCHECK_RET(obj != NULL, wxT("Unable to find stock object"));
-    wxCHECK_RET(wxPySwigInstance_Check(obj), wxT("Not a swig instance"));
-
-    // Find the class object and put it back in the instance
-    classobj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(classname));
-    wxCHECK_RET(classobj != NULL, wxT("Unable to find stock class object"));
-    PyObject_SetAttrString(obj, "__class__",  classobj);
-
-    // Rebuild the .this swigified pointer with the new value of the C++ pointer
-    ptrobj = wxPyMakeSwigPtr(ptr, wxString(classname, *wxConvCurrent));
-    PyObject_SetAttrString(obj, "this", ptrobj);
-    Py_DECREF(ptrobj);
-}
-
-
-
-void wxPy_ReinitStockObjects(int pass)
-{
+//---------------------------------------------------------------------------
 
 
-#define REINITOBJ(name, classname) \
-    if (pass == 1) { name = (classname*)0xC0C0C0C0; } \
-    else if (pass == 2) { rsoPass2(#name); } \
-    else if (pass == 3) { rsoPass3(#name, #classname, (void*)name); }
-
-
-#define REINITOBJ2(name, classname) \
-    if (pass == 1) { } \
-    else if (pass == 2) { rsoPass2(#name); } \
-    else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); }
-
-
-    REINITOBJ(wxNORMAL_FONT, wxFont);
-    REINITOBJ(wxSMALL_FONT, wxFont);
-    REINITOBJ(wxITALIC_FONT, wxFont);
-    REINITOBJ(wxSWISS_FONT, wxFont);
-
-    REINITOBJ(wxRED_PEN, wxPen);
-    REINITOBJ(wxCYAN_PEN, wxPen);
-    REINITOBJ(wxGREEN_PEN, wxPen);
-    REINITOBJ(wxBLACK_PEN, wxPen);
-    REINITOBJ(wxWHITE_PEN, wxPen);
-    REINITOBJ(wxTRANSPARENT_PEN, wxPen);
-    REINITOBJ(wxBLACK_DASHED_PEN, wxPen);
-    REINITOBJ(wxGREY_PEN, wxPen);
-    REINITOBJ(wxMEDIUM_GREY_PEN, wxPen);
-    REINITOBJ(wxLIGHT_GREY_PEN, wxPen);
-
-    REINITOBJ(wxBLUE_BRUSH, wxBrush);
-    REINITOBJ(wxGREEN_BRUSH, wxBrush);
-    REINITOBJ(wxWHITE_BRUSH, wxBrush);
-    REINITOBJ(wxBLACK_BRUSH, wxBrush);
-    REINITOBJ(wxTRANSPARENT_BRUSH, wxBrush);
-    REINITOBJ(wxCYAN_BRUSH, wxBrush);
-    REINITOBJ(wxRED_BRUSH, wxBrush);
-    REINITOBJ(wxGREY_BRUSH, wxBrush);
-    REINITOBJ(wxMEDIUM_GREY_BRUSH, wxBrush);
-    REINITOBJ(wxLIGHT_GREY_BRUSH, wxBrush);
-
-    REINITOBJ(wxBLACK, wxColour);
-    REINITOBJ(wxWHITE, wxColour);
-    REINITOBJ(wxRED, wxColour);
-    REINITOBJ(wxBLUE, wxColour);
-    REINITOBJ(wxGREEN, wxColour);
-    REINITOBJ(wxCYAN, wxColour);
-    REINITOBJ(wxLIGHT_GREY, wxColour);
-
-    REINITOBJ(wxSTANDARD_CURSOR, wxCursor);
-    REINITOBJ(wxHOURGLASS_CURSOR, wxCursor);
-    REINITOBJ(wxCROSS_CURSOR, wxCursor);
-
-    REINITOBJ2(wxNullBitmap, wxBitmap);
-    REINITOBJ2(wxNullIcon, wxIcon);
-    REINITOBJ2(wxNullCursor, wxCursor);
-    REINITOBJ2(wxNullPen, wxPen);
-    REINITOBJ2(wxNullBrush, wxBrush);
-    REINITOBJ2(wxNullPalette, wxPalette);
-    REINITOBJ2(wxNullFont, wxFont);
-    REINITOBJ2(wxNullColour, wxColour);
-
-    REINITOBJ(wxTheFontList, wxFontList);
-    REINITOBJ(wxThePenList, wxPenList);
-    REINITOBJ(wxTheBrushList, wxBrushList);
-    REINITOBJ(wxTheColourDatabase, wxColourDatabase);
-
-
-    REINITOBJ(wxTheClipboard, wxClipboard);
-    REINITOBJ2(wxDefaultValidator, wxValidator);
-    REINITOBJ2(wxNullImage, wxImage);
-    REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable);
-
-#undef REINITOBJ
-#undef REINITOBJ2
+void wxPyUserData_dtor(wxPyUserData* self) {
+    if (! wxPyDoingCleanup) {
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
+        Py_DECREF(self->m_obj);
+        self->m_obj = NULL;
+        wxPyEndBlockThreads(blocked);
+    }
 }
 
 }
 
-//---------------------------------------------------------------------------
 
 void wxPyClientData_dtor(wxPyClientData* self) {
     if (! wxPyDoingCleanup) {           // Don't do it during cleanup as Python
                                         // may have already garbage collected the object...
 
 void wxPyClientData_dtor(wxPyClientData* self) {
     if (! wxPyDoingCleanup) {           // Don't do it during cleanup as Python
                                         // may have already garbage collected the object...
-        wxPyBeginBlockThreads();
-        Py_DECREF(self->m_obj);
+        if (self->m_incRef) {
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            Py_DECREF(self->m_obj);
+            wxPyEndBlockThreads(blocked);
+        }
         self->m_obj = NULL;
         self->m_obj = NULL;
-        wxPyEndBlockThreads();
     }
 }
 
     }
 }
 
-void wxPyUserData_dtor(wxPyUserData* self) {
-    if (! wxPyDoingCleanup) {
-        wxPyBeginBlockThreads();
-        Py_DECREF(self->m_obj);
-        self->m_obj = NULL;
-        wxPyEndBlockThreads();
-    }
-}
 
 
 // This is called when an OOR controled object is being destroyed.  Although
 
 
 // This is called when an OOR controled object is being destroyed.  Although
@@ -822,7 +775,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
 
     static PyObject* deadObjectClass = NULL;
 
 
     static PyObject* deadObjectClass = NULL;
 
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (deadObjectClass == NULL) {
         deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
         // TODO:  Can not wxASSERT here because inside a wxPyBeginBlock Threads,
     if (deadObjectClass == NULL) {
         deadObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyDeadObject");
         // TODO:  Can not wxASSERT here because inside a wxPyBeginBlock Threads,
@@ -832,8 +785,9 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
     }
 
 
     }
 
 
-    // Only if there is more than one reference to the object
-    if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 ) {
+    // Only if there is more than one reference to the object and we are
+    // holding the OOR reference:
+    if ( !wxPyDoingCleanup && self->m_obj->ob_refcnt > 1 && self->m_incRef) {
         // bool isInstance = wxPyInstance_Check(self->m_obj);
         // TODO same here
         //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!"));
         // bool isInstance = wxPyInstance_Check(self->m_obj);
         // TODO same here
         //wxASSERT_MSG(isInstance, wxT("m_obj not an instance!?!?!"));
@@ -867,7 +821,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
     }
 
     // m_obj is DECREF'd in the base class dtor...
     }
 
     // m_obj is DECREF'd in the base class dtor...
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 
 }
 
 
@@ -892,16 +846,17 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName) {
 
 
 
 
 
 
-PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
+PyObject*  wxPyMake_wxObject(wxObject* source, bool setThisOwn, bool checkEvtHandler) {
     PyObject* target = NULL;
     PyObject* target = NULL;
-    bool      isEvtHandler = False;
+    bool      isEvtHandler = false;
+    bool      isSizer = false;
 
     if (source) {
         // If it's derived from wxEvtHandler then there may
         // already be a pointer to a Python object that we can use
         // in the OOR data.
         if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) {
 
     if (source) {
         // If it's derived from wxEvtHandler then there may
         // already be a pointer to a Python object that we can use
         // in the OOR data.
         if (checkEvtHandler && wxIsKindOf(source, wxEvtHandler)) {
-            isEvtHandler = True;
+            isEvtHandler = true;
             wxEvtHandler* eh = (wxEvtHandler*)source;
             wxPyOORClientData* data = (wxPyOORClientData*)eh->GetClientObject();
             if (data) {
             wxEvtHandler* eh = (wxEvtHandler*)source;
             wxPyOORClientData* data = (wxPyOORClientData*)eh->GetClientObject();
             if (data) {
@@ -911,6 +866,18 @@ PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
             }
         }
 
             }
         }
 
+        // Also check for wxSizer
+        if (!target && wxIsKindOf(source, wxSizer)) {
+            isSizer = true;
+            wxSizer* sz = (wxSizer*)source;
+            wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject();
+            if (data) {
+                target = data->m_obj;
+                if (target)
+                    Py_INCREF(target);
+            }
+        }
+        
         if (! target) {
             // Otherwise make it the old fashioned way by making a new shadow
             // object and putting this pointer in it.  Look up the class
         if (! target) {
             // Otherwise make it the old fashioned way by making a new shadow
             // object and putting this pointer in it.  Look up the class
@@ -925,9 +892,11 @@ PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
                 exists = wxPyCheckSwigType(name);
             }
             if (info) {
                 exists = wxPyCheckSwigType(name);
             }
             if (info) {
-                target = wxPyConstructObject((void*)source, name, False);
+                target = wxPyConstructObject((void*)source, name, setThisOwn);
                 if (target && isEvtHandler)
                     ((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
                 if (target && isEvtHandler)
                     ((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
+                if (target && isSizer)
+                    ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target));
             } else {
                 wxString msg(wxT("wxPython class not found for "));
                 msg += source->GetClassInfo()->GetClassName();
             } else {
                 wxString msg(wxT("wxPython class not found for "));
                 msg += source->GetClassInfo()->GetClassName();
@@ -942,26 +911,9 @@ PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
 }
 
 
 }
 
 
-PyObject*  wxPyMake_wxSizer(wxSizer* source) {
-    PyObject* target = NULL;
+PyObject*  wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) {
 
 
-    if (source && wxIsKindOf(source, wxSizer)) {
-        // If it's derived from wxSizer then there may already be a pointer to
-        // a Python object that we can use in the OOR data.
-        wxSizer* sz = (wxSizer*)source;
-        wxPyOORClientData* data = (wxPyOORClientData*)sz->GetClientObject();
-        if (data) {
-            target = data->m_obj;
-            if (target)
-                Py_INCREF(target);
-        }
-    }
-    if (! target) {
-        target = wxPyMake_wxObject(source, False);
-        if (target != Py_None)
-            ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target));
-    }
-    return target;
+    return wxPyMake_wxObject(source, setThisOwn);
 }
 
 
 }
 
 
@@ -969,6 +921,8 @@ PyObject*  wxPyMake_wxSizer(wxSizer* source) {
 
 
 #ifdef WXP_WITH_THREAD
 
 
 #ifdef WXP_WITH_THREAD
+#if !wxPyUSE_GIL_STATE
+
 inline
 unsigned long wxPyGetCurrentThreadId() {
     return wxThread::GetCurrentId();
 inline
 unsigned long wxPyGetCurrentThreadId() {
     return wxThread::GetCurrentId();
@@ -1013,11 +967,12 @@ void wxPySaveThreadState(PyThreadState* tstate) {
             if (info.tstate != tstate)
                 wxLogMessage("*** tstate mismatch!???");
 #endif
             if (info.tstate != tstate)
                 wxLogMessage("*** tstate mismatch!???");
 #endif
-            // info.tstate = tstate;    *** DO NOT update existing ones???
+            info.tstate = tstate;    // allow for transient tstates
             // Normally it will never change, but apparently COM callbacks
             // (i.e. ActiveX controls) will (incorrectly IMHO) use a transient
             // tstate which will then be garbage the next time we try to use
             // it...
             // Normally it will never change, but apparently COM callbacks
             // (i.e. ActiveX controls) will (incorrectly IMHO) use a transient
             // tstate which will then be garbage the next time we try to use
             // it...
+
             wxPyTMutex->Unlock();
             return;
         }
             wxPyTMutex->Unlock();
             return;
         }
@@ -1028,6 +983,7 @@ void wxPySaveThreadState(PyThreadState* tstate) {
 }
 
 #endif
 }
 
 #endif
+#endif
 
 
 
 
 
 
@@ -1037,8 +993,9 @@ void wxPySaveThreadState(PyThreadState* tstate) {
 PyThreadState* wxPyBeginAllowThreads() {
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
 PyThreadState* wxPyBeginAllowThreads() {
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
+#if !wxPyUSE_GIL_STATE
     wxPySaveThreadState(saved);
     wxPySaveThreadState(saved);
-    wxPyGetThreadState()->blocked -= 1;
+#endif
     return saved;
 #else
     return NULL;
     return saved;
 #else
     return NULL;
@@ -1047,7 +1004,6 @@ PyThreadState* wxPyBeginAllowThreads() {
 
 void wxPyEndAllowThreads(PyThreadState* saved) {
 #ifdef WXP_WITH_THREAD
 
 void wxPyEndAllowThreads(PyThreadState* saved) {
 #ifdef WXP_WITH_THREAD
-    wxPyGetThreadState()->blocked += 1;
     PyEval_RestoreThread(saved);   // Py_END_ALLOW_THREADS;
 #endif
 }
     PyEval_RestoreThread(saved);   // Py_END_ALLOW_THREADS;
 #endif
 }
@@ -1057,24 +1013,50 @@ void wxPyEndAllowThreads(PyThreadState* saved) {
 // Calls from wxWindows back to Python code, or even any PyObject
 // manipulations, PyDECREF's and etc. are wrapped in calls to these functions:
 
 // Calls from wxWindows back to Python code, or even any PyObject
 // manipulations, PyDECREF's and etc. are wrapped in calls to these functions:
 
-void wxPyBeginBlockThreads() {
+wxPyBlock_t wxPyBeginBlockThreads() {
 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD
+    if (! Py_IsInitialized()) {
+        return (wxPyBlock_t)0;
+    }
+#if wxPyUSE_GIL_STATE
+    PyGILState_STATE state = PyGILState_Ensure();
+    return state;
+#else
+    PyThreadState *current = _PyThreadState_Current;
+
+    // Only block if there wasn't already a tstate, or if the current one is
+    // not the one we are wanting to change to.  This should prevent deadlock
+    // if there are nested calls to wxPyBeginBlockThreads
+    wxPyBlock_t blocked = false;
     wxPyThreadState* tstate = wxPyGetThreadState();
     wxPyThreadState* tstate = wxPyGetThreadState();
-    if (tstate->blocked++ == 0) {  // if nested calls then do nothing
+    if (current != tstate->tstate) {
         PyEval_RestoreThread(tstate->tstate);
         PyEval_RestoreThread(tstate->tstate);
+        blocked = true;
     }
     }
+    return blocked;
+#endif
+#else
+    return (wxPyBlock_t)0;
 #endif
 }
 
 
 #endif
 }
 
 
-void wxPyEndBlockThreads() {
+void wxPyEndBlockThreads(wxPyBlock_t blocked) {
 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD
-    wxPyThreadState* tstate = wxPyGetThreadState();
-    tstate->blocked -= 1;
-    if ( tstate->blocked == 0) {  // if nested calls then do nothing
+    if (! Py_IsInitialized()) {
+        return;
+    }            
+#if wxPyUSE_GIL_STATE
+    PyGILState_Release(blocked);
+#else
+    // Only unblock if we blocked in the last call to wxPyBeginBlockThreads.
+    // The value of blocked passed in needs to be the same as that returned
+    // from wxPyBeginBlockThreads at the same nesting level.
+    if ( blocked ) {
         PyEval_SaveThread();
     }
 #endif
         PyEval_SaveThread();
     }
 #endif
+#endif
 }
 
 
 }
 
 
@@ -1094,11 +1076,12 @@ bool wxPyInputStream::eof() {
     if (m_wxis)
         return m_wxis->Eof();
     else
     if (m_wxis)
         return m_wxis->Eof();
     else
-        return True;
+        return true;
 }
 
 wxPyInputStream::~wxPyInputStream() {
 }
 
 wxPyInputStream::~wxPyInputStream() {
-    /* do nothing */
+    if (m_wxis)
+        delete m_wxis;
 }
 
 
 }
 
 
@@ -1111,9 +1094,9 @@ PyObject* wxPyInputStream::read(int size) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
         PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
         return NULL;
     }
 
@@ -1130,7 +1113,7 @@ PyObject* wxPyInputStream::read(int size) {
     }
 
     // error check
     }
 
     // error check
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
@@ -1139,7 +1122,7 @@ PyObject* wxPyInputStream::read(int size) {
         // We use only strings for the streams, not unicode
         obj = PyString_FromStringAndSize(buf, buf.GetDataLen());
     }
         // We use only strings for the streams, not unicode
         obj = PyString_FromStringAndSize(buf, buf.GetDataLen());
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return obj;
 }
 
     return obj;
 }
 
@@ -1152,9 +1135,9 @@ PyObject* wxPyInputStream::readline(int size) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
         return NULL;
     }
 
@@ -1165,7 +1148,7 @@ PyObject* wxPyInputStream::readline(int size) {
     }
 
     // errorcheck
     }
 
     // errorcheck
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
@@ -1174,7 +1157,7 @@ PyObject* wxPyInputStream::readline(int size) {
         // We use only strings for the streams, not unicode
         obj = PyString_FromStringAndSize((char*)buf.GetData(), buf.GetDataLen());
     }
         // We use only strings for the streams, not unicode
         obj = PyString_FromStringAndSize((char*)buf.GetData(), buf.GetDataLen());
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return obj;
 }
 
     return obj;
 }
 
@@ -1184,19 +1167,21 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
 
     // check if we have a real wxInputStream to work with
     if (!m_wxis) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
     // init list
         return NULL;
     }
 
     // init list
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     pylist = PyList_New(0);
     pylist = PyList_New(0);
+    wxPyEndBlockThreads(blocked);
+
     if (!pylist) {
     if (!pylist) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyErr_NoMemory();
         PyErr_NoMemory();
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
         return NULL;
     }
 
@@ -1205,24 +1190,24 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
     for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) {
         PyObject* s = this->readline();
         if (s == NULL) {
     for (i=0; (m_wxis->CanRead()) && ((sizehint < 0) || (i < sizehint));) {
         PyObject* s = this->readline();
         if (s == NULL) {
-            wxPyBeginBlockThreads();
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             Py_DECREF(pylist);
             Py_DECREF(pylist);
-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);
             return NULL;
         }
             return NULL;
         }
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         PyList_Append(pylist, s);
         i += PyString_Size(s);
         PyList_Append(pylist, s);
         i += PyString_Size(s);
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
     }
 
     // error check
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
     }
 
     // error check
     wxStreamError err = m_wxis->GetLastError();
     if (err != wxSTREAM_NO_ERROR && err != wxSTREAM_EOF) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         Py_DECREF(pylist);
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
         Py_DECREF(pylist);
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
         return NULL;
     }
 
@@ -1248,18 +1233,31 @@ wxPyCBInputStream::wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool
     : wxInputStream(), m_read(r), m_seek(s), m_tell(t), m_block(block)
 {}
 
     : wxInputStream(), m_read(r), m_seek(s), m_tell(t), m_block(block)
 {}
 
+wxPyCBInputStream::wxPyCBInputStream(const wxPyCBInputStream& other)
+{
+    m_read  = other.m_read;
+    m_seek  = other.m_seek;
+    m_tell  = other.m_tell;
+    m_block = other.m_block;
+    Py_INCREF(m_read);
+    Py_INCREF(m_seek);
+    Py_INCREF(m_tell);
+}
+
 
 wxPyCBInputStream::~wxPyCBInputStream() {
 
 wxPyCBInputStream::~wxPyCBInputStream() {
-    if (m_block) wxPyBeginBlockThreads();
+    wxPyBlock_t blocked;
+    if (m_block) blocked = wxPyBeginBlockThreads();
     Py_XDECREF(m_read);
     Py_XDECREF(m_seek);
     Py_XDECREF(m_tell);
     Py_XDECREF(m_read);
     Py_XDECREF(m_seek);
     Py_XDECREF(m_tell);
-    if (m_block) wxPyEndBlockThreads();
+    if (m_block) wxPyEndBlockThreads(blocked);
 }
 
 
 wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
 }
 
 
 wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
-    if (block) wxPyBeginBlockThreads();
+    wxPyBlock_t blocked;
+    if (block) blocked = wxPyBeginBlockThreads();
 
     PyObject* read = getMethod(py, "read");
     PyObject* seek = getMethod(py, "seek");
 
     PyObject* read = getMethod(py, "read");
     PyObject* seek = getMethod(py, "seek");
@@ -1270,11 +1268,11 @@ wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
         Py_XDECREF(read);
         Py_XDECREF(seek);
         Py_XDECREF(tell);
         Py_XDECREF(read);
         Py_XDECREF(seek);
         Py_XDECREF(tell);
-        if (block) wxPyEndBlockThreads();
+        if (block) wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
         return NULL;
     }
 
-    if (block) wxPyEndBlockThreads();
+    if (block) wxPyEndBlockThreads(blocked);
     return new wxPyCBInputStream(read, seek, tell, block);
 }
 
     return new wxPyCBInputStream(read, seek, tell, block);
 }
 
@@ -1283,6 +1281,10 @@ wxPyCBInputStream* wxPyCBInputStream_create(PyObject *py, bool block) {
     return wxPyCBInputStream::create(py, block);
 }
 
     return wxPyCBInputStream::create(py, block);
 }
 
+wxPyCBInputStream* wxPyCBInputStream_copy(wxPyCBInputStream* other) {
+    return new wxPyCBInputStream(*other);
+}
+
 PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) {
     if (!PyObject_HasAttrString(py, name))
         return NULL;
 PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) {
     if (!PyObject_HasAttrString(py, name))
         return NULL;
@@ -1295,16 +1297,16 @@ PyObject* wxPyCBInputStream::getMethod(PyObject* py, char* name) {
 }
 
 
 }
 
 
-size_t wxPyCBInputStream::GetSize() const {
+wxFileOffset wxPyCBInputStream::GetLength() const {
     wxPyCBInputStream* self = (wxPyCBInputStream*)this; // cast off const
     if (m_seek && m_tell) {
     wxPyCBInputStream* self = (wxPyCBInputStream*)this; // cast off const
     if (m_seek && m_tell) {
-        off_t temp = self->OnSysTell();
-        off_t ret = self->OnSysSeek(0, wxFromEnd);
+        wxFileOffset temp = self->OnSysTell();
+        wxFileOffset ret = self->OnSysSeek(0, wxFromEnd);
         self->OnSysSeek(temp, wxFromStart);
         return ret;
     }
     else
         self->OnSysSeek(temp, wxFromStart);
         return ret;
     }
     else
-        return 0;
+        return wxInvalidOffset;
 }
 
 
 }
 
 
@@ -1312,7 +1314,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) {
     if (bufsize == 0)
         return 0;
 
     if (bufsize == 0)
         return 0;
 
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     PyObject* arglist = Py_BuildValue("(i)", bufsize);
     PyObject* result = PyEval_CallObject(m_read, arglist);
     Py_DECREF(arglist);
     PyObject* arglist = Py_BuildValue("(i)", bufsize);
     PyObject* result = PyEval_CallObject(m_read, arglist);
     Py_DECREF(arglist);
@@ -1330,7 +1332,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) {
     }
     else
         m_lasterror = wxSTREAM_READ_ERROR;
     }
     else
         m_lasterror = wxSTREAM_READ_ERROR;
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return o;
 }
 
     return o;
 }
 
@@ -1339,38 +1341,42 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) {
     return 0;
 }
 
     return 0;
 }
 
-off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode mode) {
-    wxPyBeginBlockThreads();
-#ifdef _LARGE_FILES
-    // off_t is a 64-bit value...
-    PyObject* arglist = Py_BuildValue("(Li)", off, mode);
-#else
-    PyObject* arglist = Py_BuildValue("(ii)", off, mode);
-#endif
+
+wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    PyObject* arglist = PyTuple_New(2);
+
+    if (sizeof(wxFileOffset) > sizeof(long))
+        // wxFileOffset is a 64-bit value...
+        PyTuple_SET_ITEM(arglist, 0, PyLong_FromLongLong(off));
+    else
+        PyTuple_SET_ITEM(arglist, 0, PyInt_FromLong(off));
+
+    PyTuple_SET_ITEM(arglist, 1, PyInt_FromLong(mode));
+
+
     PyObject* result = PyEval_CallObject(m_seek, arglist);
     Py_DECREF(arglist);
     Py_XDECREF(result);
     PyObject* result = PyEval_CallObject(m_seek, arglist);
     Py_DECREF(arglist);
     Py_XDECREF(result);
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return OnSysTell();
 }
 
 
     return OnSysTell();
 }
 
 
-off_t wxPyCBInputStream::OnSysTell() const {
-    wxPyBeginBlockThreads();
+wxFileOffset wxPyCBInputStream::OnSysTell() const {
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     PyObject* arglist = Py_BuildValue("()");
     PyObject* result = PyEval_CallObject(m_tell, arglist);
     Py_DECREF(arglist);
     PyObject* arglist = Py_BuildValue("()");
     PyObject* result = PyEval_CallObject(m_tell, arglist);
     Py_DECREF(arglist);
-    off_t o = 0;
+    wxFileOffset o = 0;
     if (result != NULL) {
     if (result != NULL) {
-#ifdef _LARGE_FILES
         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else
         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else
-#endif
             o = PyInt_AsLong(result);
         Py_DECREF(result);
     };
             o = PyInt_AsLong(result);
         Py_DECREF(result);
     };
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return o;
 }
 
     return o;
 }
 
@@ -1389,12 +1395,14 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
 }
 
 wxPyCallback::~wxPyCallback() {
 }
 
 wxPyCallback::~wxPyCallback() {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     Py_DECREF(m_func);
     Py_DECREF(m_func);
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 
 }
 
 
+#define wxPy_PRECALLINIT     "_preCallInit"
+#define wxPy_POSTCALLCLEANUP "_postCallCleanup"
 
 // 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) {
@@ -1403,9 +1411,9 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       result;
     PyObject*       arg;
     PyObject*       tuple;
     PyObject*       result;
     PyObject*       arg;
     PyObject*       tuple;
-    bool            checkSkip = False;
+    bool            checkSkip = false;
 
 
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     wxString className = event.GetClassInfo()->GetClassName();
 
     // If the event is one of these types then pass the original
     wxString className = event.GetClassInfo()->GetClassName();
 
     // If the event is one of these types then pass the original
@@ -1425,17 +1433,25 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     if (!arg) {
         PyErr_Print();
     } else {
     if (!arg) {
         PyErr_Print();
     } else {
+        // "intern" the pre/post method names to speed up the HasAttr
+        static PyObject* s_preName  = NULL;
+        static PyObject* s_postName = NULL;
+        if (s_preName == NULL) {
+            s_preName  = PyString_FromString(wxPy_PRECALLINIT);
+            s_postName = PyString_FromString(wxPy_POSTCALLCLEANUP);
+        }
+
         // Check if the event object needs some preinitialization
         // Check if the event object needs some preinitialization
-        if (PyObject_HasAttrString(arg, "_preInit")) {
-            result = PyObject_CallMethod(arg, "_preInit", "O", arg);
+        if (PyObject_HasAttr(arg, s_preName)) {
+            result = PyObject_CallMethodObjArgs(arg, s_preName, arg, NULL);
             if ( result ) {
                 Py_DECREF(result);   // result is ignored, but we still need to decref it
                 PyErr_Clear();       // Just in case...
             } else {
                 PyErr_Print();
             if ( result ) {
                 Py_DECREF(result);   // result is ignored, but we still need to decref it
                 PyErr_Clear();       // Just in case...
             } else {
                 PyErr_Print();
-            }            
+            }
         }
         }
-        
+
         // Call the event handler, passing the event object
         tuple = PyTuple_New(1);
         PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg
         // Call the event handler, passing the event object
         tuple = PyTuple_New(1);
         PyTuple_SET_ITEM(tuple, 0, arg);  // steals ref to arg
@@ -1447,6 +1463,17 @@ void wxPyCallback::EventThunker(wxEvent& event) {
             PyErr_Print();
         }
 
             PyErr_Print();
         }
 
+        // Check if the event object needs some post cleanup
+        if (PyObject_HasAttr(arg, s_postName)) {
+            result = PyObject_CallMethodObjArgs(arg, s_postName, arg, NULL);
+            if ( result ) {
+                Py_DECREF(result);   // result is ignored, but we still need to decref it
+                PyErr_Clear();       // Just in case...
+            } else {
+                PyErr_Print();
+            }
+        }
+
         if ( checkSkip ) {
             // if the event object was one of our special types and
             // it had been cloned, then we need to extract the Skipped
         if ( checkSkip ) {
             // if the event object was one of our special types and
             // it had been cloned, then we need to extract the Skipped
@@ -1461,7 +1488,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
         }
         Py_DECREF(tuple);
     }
         }
         Py_DECREF(tuple);
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 
 }
 
 
@@ -1551,52 +1578,88 @@ PyObject* PyFindClassWithAttr(PyObject *klass, PyObject *name)
 
 
 static
 
 
 static
-PyObject* PyMethod_GetDefiningClass(PyObject* method, const char* name)
+PyObject* PyMethod_GetDefiningClass(PyObject* method, PyObject* nameo)
 {
     PyObject* mgc = PyMethod_GET_CLASS(method);
 
 #if PYTHON_API_VERSION <= 1010    // prior to Python 2.2, the easy way
     return mgc;
 #else                             // 2.2 and after, the hard way...
 {
     PyObject* mgc = PyMethod_GET_CLASS(method);
 
 #if PYTHON_API_VERSION <= 1010    // prior to Python 2.2, the easy way
     return mgc;
 #else                             // 2.2 and after, the hard way...
-
-    PyObject* nameo = PyString_FromString(name);
-    PyObject* klass = PyFindClassWithAttr(mgc, nameo);
-    Py_DECREF(nameo);
-    return klass;
+    return PyFindClassWithAttr(mgc, nameo);
 #endif
 }
 
 
 
 #endif
 }
 
 
 
-bool wxPyCallbackHelper::findCallback(const char* name) const {
+// To avoid recursion when an overridden virtual method wants to call the base
+// class version, temporarily set an attribute in the instance with the same
+// name as the method.  Then the PyObject_GetAttr in the next findCallback
+// will return this attribute and the PyMethod_Check will fail.
+
+void wxPyCallbackHelper::setRecursionGuard(PyObject* method) const
+{
+    PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method);
+    PyObject_SetAttr(m_self, func->func_name, Py_None);
+}
+
+void wxPyCallbackHelper::clearRecursionGuard(PyObject* method) const
+{
+    PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method);
+    if (PyObject_HasAttr(m_self, func->func_name)) {
+        PyObject_DelAttr(m_self, func->func_name);
+    }
+}
+
+// bool wxPyCallbackHelper::hasRecursionGuard(PyObject* method) const
+// {
+//     PyFunctionObject* func = (PyFunctionObject*)PyMethod_Function(method);
+//     if (PyObject_HasAttr(m_self, func->func_name)) {
+//         PyObject* attr = PyObject_GetAttr(m_self, func->func_name);
+//         bool retval = (attr == Py_None);
+//         Py_DECREF(attr);
+//         return retval;
+//     }
+//     return false;
+// }
+
+
+bool wxPyCallbackHelper::findCallback(const char* name, bool setGuard) const {
     wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const
     wxPyCallbackHelper* self = (wxPyCallbackHelper*)this; // cast away const
+    PyObject *method, *klass;
+    PyObject* nameo = PyString_FromString(name);
     self->m_lastFound = NULL;
 
     // If the object (m_self) has an attibute of the given name...
     self->m_lastFound = NULL;
 
     // If the object (m_self) has an attibute of the given name...
-    if (m_self && PyObject_HasAttrString(m_self, (char*)name)) {
-        PyObject *method, *klass;
-        method = PyObject_GetAttrString(m_self, (char*)name);
+    if (m_self && PyObject_HasAttr(m_self, nameo)) {
+        method = PyObject_GetAttr(m_self, nameo);
 
         // ...and if that attribute is a method, and if that method's class is
 
         // ...and if that attribute is a method, and if that method's class is
-        // not from a base class...
+        // not from the registered class or a base class...
         if (PyMethod_Check(method) &&
         if (PyMethod_Check(method) &&
-            (klass = PyMethod_GetDefiningClass(method, (char*)name)) != NULL &&
-            ((klass == m_class) || PyObject_IsSubclass(klass, m_class))) {
-
-            // ...then we'll save a pointer to the method so callCallback can call it.
+            (klass = PyMethod_GetDefiningClass(method, nameo)) != NULL &&
+            (klass != m_class) &&
+            PyObject_IsSubclass(klass, m_class)) {
+
+            // ...then we'll save a pointer to the method so callCallback can
+            // call it.  But first, set a recursion guard in case the
+            // overridden method wants to call the base class version.
+            if (setGuard)
+                setRecursionGuard(method);
             self->m_lastFound = method;
         }
         else {
             Py_DECREF(method);
         }
     }
             self->m_lastFound = method;
         }
         else {
             Py_DECREF(method);
         }
     }
+    
+    Py_DECREF(nameo);
     return m_lastFound != NULL;
 }
 
 
 int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
     PyObject*   result;
     return m_lastFound != NULL;
 }
 
 
 int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
     PyObject*   result;
-    int         retval = False;
+    int         retval = false;
 
     result = callCallbackObj(argTuple);
     if (result) {                       // Assumes an integer return type...
 
     result = callCallbackObj(argTuple);
     if (result) {                       // Assumes an integer return type...
@@ -1618,6 +1681,8 @@ PyObject* wxPyCallbackHelper::callCallbackObj(PyObject* argTuple) const {
     PyObject* method = m_lastFound;
 
     result = PyEval_CallObject(method, argTuple);
     PyObject* method = m_lastFound;
 
     result = PyEval_CallObject(method, argTuple);
+    clearRecursionGuard(method);
+    
     Py_DECREF(argTuple);
     Py_DECREF(method);
     if (!result) {
     Py_DECREF(argTuple);
     Py_DECREF(method);
     if (!result) {
@@ -1631,8 +1696,8 @@ void wxPyCBH_setCallbackInfo(wxPyCallbackHelper& cbh, PyObject* self, PyObject*
     cbh.setSelf(self, klass, incref);
 }
 
     cbh.setSelf(self, klass, incref);
 }
 
-bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name) {
-    return cbh.findCallback(name);
+bool wxPyCBH_findCallback(const wxPyCallbackHelper& cbh, const char* name, bool setGuard) {
+    return cbh.findCallback(name, setGuard);
 }
 
 int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple) {
 }
 
 int  wxPyCBH_callCallback(const wxPyCallbackHelper& cbh, PyObject* argTuple) {
@@ -1646,10 +1711,10 @@ PyObject* wxPyCBH_callCallbackObj(const wxPyCallbackHelper& cbh, PyObject* argTu
 
 void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
     if (cbh->m_incRef) {
 
 void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
     if (cbh->m_incRef) {
-        wxPyBeginBlockThreads();
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();
         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);
         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);
-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);
     }
 }
 
     }
 }
 
@@ -1663,26 +1728,26 @@ void wxPyCBH_delete(wxPyCallbackHelper* cbh) {
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
 wxPyEvtSelfRef::wxPyEvtSelfRef() {
     //m_self = Py_None;         // **** We don't do normal ref counting to prevent
     //Py_INCREF(m_self);        //      circular loops...
-    m_cloned = False;
+    m_cloned = false;
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (m_cloned)
         Py_DECREF(m_self);
     if (m_cloned)
         Py_DECREF(m_self);
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;
     if (clone) {
         Py_INCREF(m_self);
     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;
     if (clone) {
         Py_INCREF(m_self);
-        m_cloned = True;
+        m_cloned = true;
     }
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
 }
 
 PyObject* wxPyEvtSelfRef::GetSelf() const {
 }
 
 PyObject* wxPyEvtSelfRef::GetSelf() const {
@@ -1703,7 +1768,7 @@ wxPyEvent::wxPyEvent(int winid, wxEventType commandType)
 wxPyEvent::wxPyEvent(const wxPyEvent& evt)
     : wxEvent(evt)
 {
 wxPyEvent::wxPyEvent(const wxPyEvent& evt)
     : wxEvent(evt)
 {
-    SetSelf(evt.m_self, True);
+    SetSelf(evt.m_self, true);
 }
 
 
 }
 
 
@@ -1719,7 +1784,7 @@ wxPyCommandEvent::wxPyCommandEvent(wxEventType commandType, int id)
 wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt)
     : wxCommandEvent(evt)
 {
 wxPyCommandEvent::wxPyCommandEvent(const wxPyCommandEvent& evt)
     : wxCommandEvent(evt)
 {
-    SetSelf(evt.m_self, True);
+    SetSelf(evt.m_self, true);
 }
 
 
 }
 
 
@@ -1741,15 +1806,15 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) {
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
-    wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
-        pyObj = wxPyMake_wxObject(wxObj);
+        pyObj = wxPyMake_wxObject(wxObj,false);
         PyList_Append(pyList, pyObj);
         node = node->GetNext();
     }
         PyList_Append(pyList, pyObj);
         node = node->GetNext();
     }
-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);
     return pyList;
 }
 
     return pyList;
 }
 
@@ -1761,22 +1826,13 @@ long wxPyGetWinHandle(wxWindow* win) {
     return (long)win->GetHandle();
 #endif
 
     return (long)win->GetHandle();
 #endif
 
-    // Find and return the actual X-Window.
-#ifdef __WXGTK__
-    if (win->m_wxwindow) {
-#ifdef __WXGTK20__
-        return (long) GDK_WINDOW_XWINDOW(GTK_PIZZA(win->m_wxwindow)->bin_window);
-#else
-        GdkWindowPrivate* bwin = (GdkWindowPrivate*)GTK_PIZZA(win->m_wxwindow)->bin_window;
-        if (bwin) {
-            return (long)bwin->xwindow;
-        }
-#endif
-    }
+#if defined(__WXGTK__) || defined(__WXX11)
+    return (long)GetXWindow(win);
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__
-    return (long)MAC_WXHWND(win->MacGetRootWindow());
+    //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef());
+    return (long)win->GetHandle();
 #endif
 
     return 0;
 #endif
 
     return 0;
@@ -1786,50 +1842,47 @@ long wxPyGetWinHandle(wxWindow* win) {
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file over and over again...
 
 // Some helper functions for typemaps in my_typemaps.i, so they won't be
 // included in every file over and over again...
 
-#if PYTHON_API_VERSION >= 1009
-    static char* wxStringErrorMsg = "String or Unicode type required";
-#else
-    static char* wxStringErrorMsg = "String type required";
-#endif
-
-
 wxString* wxString_in_helper(PyObject* source) {
 wxString* wxString_in_helper(PyObject* source) {
-    wxString* target;
-#if PYTHON_API_VERSION >= 1009  // Have Python unicode API
+    wxString* target = NULL;
+
     if (!PyString_Check(source) && !PyUnicode_Check(source)) {
     if (!PyString_Check(source) && !PyUnicode_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        PyErr_SetString(PyExc_TypeError, "String or Unicode type required");
         return NULL;
     }
 #if wxUSE_UNICODE
         return NULL;
     }
 #if wxUSE_UNICODE
-    if (PyUnicode_Check(source)) {
-        target = new wxString();
-        size_t len = PyUnicode_GET_SIZE(source);
-        if (len) {
-            PyUnicode_AsWideChar((PyUnicodeObject*)source, target->GetWriteBuf(len), len);
-            target->UngetWriteBuf();
-        }
-    } else {
-        // It is a string, get pointers to it and transform to unicode
-        char* tmpPtr; int tmpSize;
-        PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
-        target = new wxString(tmpPtr, *wxConvCurrent, tmpSize);
+    PyObject* uni = source;
+    if (PyString_Check(source)) {
+        uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
+        if (PyErr_Occurred()) return NULL;
+    }
+    target = new wxString();
+    size_t len = PyUnicode_GET_SIZE(uni);
+    if (len) {
+        PyUnicode_AsWideChar((PyUnicodeObject*)uni, target->GetWriteBuf(len), len);
+        target->UngetWriteBuf(len);
     }
     }
+
+    if (PyString_Check(source))
+        Py_DECREF(uni);
 #else
 #else
-    char* tmpPtr; int tmpSize;
-    if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) {
-        PyErr_SetString(PyExc_TypeError, "Unable to convert string");
-        return NULL;
+    // Convert to a string object if it isn't already, then to wxString
+    PyObject* str = source;
+    if (PyUnicode_Check(source)) {
+        str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
+        if (PyErr_Occurred()) return NULL;
     }
     }
+    else if (!PyString_Check(source)) {
+        str = PyObject_Str(source);
+        if (PyErr_Occurred()) return NULL;
+    }
+    char* tmpPtr; int tmpSize;
+    PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
     target = new wxString(tmpPtr, tmpSize);
     target = new wxString(tmpPtr, tmpSize);
+
+    if (!PyString_Check(source))
+        Py_DECREF(str);
 #endif // wxUSE_UNICODE
 
 #endif // wxUSE_UNICODE
 
-#else  // No Python unicode API (1.5.2)
-    if (!PyString_Check(source)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    target = new wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source));
-#endif
     return target;
 }
 
     return target;
 }
 
@@ -1838,45 +1891,41 @@ wxString* wxString_in_helper(PyObject* source) {
 wxString Py2wxString(PyObject* source)
 {
     wxString target;
 wxString Py2wxString(PyObject* source)
 {
     wxString target;
-    bool     doDecRef = False;
 
 
-#if PYTHON_API_VERSION >= 1009  // Have Python unicode API
-    if (!PyString_Check(source) && !PyUnicode_Check(source)) {
-        // Convert to String if not one already...  (TODO: Unicode too?)
-        source = PyObject_Str(source);
-        doDecRef = True;
+#if wxUSE_UNICODE
+    // Convert to a unicode object, if not already, then to a wxString
+    PyObject* uni = source;
+    if (!PyUnicode_Check(source)) {
+        uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
+        if (PyErr_Occurred()) return wxEmptyString;  // TODO:  should we PyErr_Clear?
+    }
+    size_t len = PyUnicode_GET_SIZE(uni);
+    if (len) {
+        PyUnicode_AsWideChar((PyUnicodeObject*)uni, target.GetWriteBuf(len), len);
+        target.UngetWriteBuf();
     }
 
     }
 
-#if wxUSE_UNICODE
+    if (!PyUnicode_Check(source))
+        Py_DECREF(uni);
+#else
+    // Convert to a string object if it isn't already, then to wxString
+    PyObject* str = source;
     if (PyUnicode_Check(source)) {
     if (PyUnicode_Check(source)) {
-        size_t len = PyUnicode_GET_SIZE(source);
-        if (len) {
-            PyUnicode_AsWideChar((PyUnicodeObject*)source, target.GetWriteBuf(len), len);
-            target.UngetWriteBuf();
-        }
-    } else {
-        // It is a string, get pointers to it and transform to unicode
-        char* tmpPtr; int tmpSize;
-        PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
-        target = wxString(tmpPtr, *wxConvCurrent, tmpSize);
+        str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
+        if (PyErr_Occurred()) return wxEmptyString;    // TODO:  should we PyErr_Clear?
+    }
+    else if (!PyString_Check(source)) {
+        str = PyObject_Str(source);
+        if (PyErr_Occurred()) return wxEmptyString;    // TODO:  should we PyErr_Clear?
     }
     }
-#else
     char* tmpPtr; int tmpSize;
     char* tmpPtr; int tmpSize;
-    PyString_AsStringAndSize(source, &tmpPtr, &tmpSize);
+    PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
     target = wxString(tmpPtr, tmpSize);
     target = wxString(tmpPtr, tmpSize);
-#endif // wxUSE_UNICODE
 
 
-#else  // No Python unicode API (1.5.2)
-    if (!PyString_Check(source)) {
-        // Convert to String if not one already...
-        source = PyObject_Str(source);
-        doDecRef = True;
-    }
-    target = wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source));
-#endif
+    if (!PyString_Check(source))
+        Py_DECREF(str);
+#endif // wxUSE_UNICODE
 
 
-    if (doDecRef)
-        Py_DECREF(source);
     return target;
 }
 
     return target;
 }
 
@@ -1894,6 +1943,17 @@ PyObject* wx2PyString(const wxString& src)
 }
 
 
 }
 
 
+
+void wxSetDefaultPyEncoding(const char* encoding)
+{
+    strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE);
+}
+
+const char* wxGetDefaultPyEncoding()
+{
+    return wxPyDefaultEncoding;
+}
+
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 
 
@@ -1994,24 +2054,24 @@ static inline bool wxPointFromObjects(PyObject* o1, PyObject* o2, wxPoint* point
     if (PyInt_Check(o1) && PyInt_Check(o2)) {
         point->x = PyInt_AS_LONG(o1);
         point->y = PyInt_AS_LONG(o2);
     if (PyInt_Check(o1) && PyInt_Check(o2)) {
         point->x = PyInt_AS_LONG(o1);
         point->y = PyInt_AS_LONG(o2);
-        return True;
+        return true;
     }
     if (PyFloat_Check(o1) && PyFloat_Check(o2)) {
         point->x = (int)PyFloat_AS_DOUBLE(o1);
         point->y = (int)PyFloat_AS_DOUBLE(o2);
     }
     if (PyFloat_Check(o1) && PyFloat_Check(o2)) {
         point->x = (int)PyFloat_AS_DOUBLE(o1);
         point->y = (int)PyFloat_AS_DOUBLE(o2);
-        return True;
+        return true;
     }
     if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) {  // TODO: Why???
         // Disallow instances because they can cause havok
     }
     if (wxPySwigInstance_Check(o1) || wxPySwigInstance_Check(o2)) {  // TODO: Why???
         // Disallow instances because they can cause havok
-        return False;
+        return false;
     }
     if (PyNumber_Check(o1) && PyNumber_Check(o2)) {
         // I believe this excludes instances, so this should be safe without INCREFFing o1 and o2
         point->x = PyInt_AsLong(o1);
         point->y = PyInt_AsLong(o2);
     }
     if (PyNumber_Check(o1) && PyNumber_Check(o2)) {
         // I believe this excludes instances, so this should be safe without INCREFFing o1 and o2
         point->x = PyInt_AsLong(o1);
         point->y = PyInt_AsLong(o2);
-        return True;
+        return true;
     }
     }
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -2237,7 +2297,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) {
     PyObject *o1, *o2;
 
     if (!PySequence_Check(source) || PySequence_Length(source) != 2)
     PyObject *o1, *o2;
 
     if (!PySequence_Check(source) || PySequence_Length(source) != 2)
-        return False;
+        return false;
 
     if (isFast) {
         o1 = PySequence_Fast_GET_ITEM(source, 0);
 
     if (isFast) {
         o1 = PySequence_Fast_GET_ITEM(source, 0);
@@ -2255,7 +2315,7 @@ bool wxPy2int_seq_helper(PyObject* source, int* i1, int* i2) {
         Py_DECREF(o1);
         Py_DECREF(o2);
     }
         Py_DECREF(o1);
         Py_DECREF(o2);
     }
-    return True;
+    return true;
 }
 
 
 }
 
 
@@ -2264,7 +2324,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) {
     PyObject *o1, *o2, *o3, *o4;
 
     if (!PySequence_Check(source) || PySequence_Length(source) != 4)
     PyObject *o1, *o2, *o3, *o4;
 
     if (!PySequence_Check(source) || PySequence_Length(source) != 4)
-        return False;
+        return false;
 
     if (isFast) {
         o1 = PySequence_Fast_GET_ITEM(source, 0);
 
     if (isFast) {
         o1 = PySequence_Fast_GET_ITEM(source, 0);
@@ -2290,7 +2350,7 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) {
         Py_DECREF(o3);
         Py_DECREF(o4);
     }
         Py_DECREF(o3);
         Py_DECREF(o4);
     }
-    return True;
+    return true;
 }
 
 
 }
 
 
@@ -2302,20 +2362,20 @@ bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
 
     if (wxPySwigInstance_Check(source) &&
         wxPyConvertSwigPtr(source, (void **)&ptr, classname))
 
     if (wxPySwigInstance_Check(source) &&
         wxPyConvertSwigPtr(source, (void **)&ptr, classname))
-        return True;
+        return true;
 
     PyErr_Clear();
     if (PySequence_Check(source) && PySequence_Length(source) == seqLen)
 
     PyErr_Clear();
     if (PySequence_Check(source) && PySequence_Length(source) == seqLen)
-        return True;
+        return true;
 
 
-    return False;
+    return false;
 }
 
 bool wxSize_helper(PyObject* source, wxSize** obj)
 {
     if (source == Py_None) {
         **obj = wxSize(-1,-1);
 }
 
 bool wxSize_helper(PyObject* source, wxSize** obj)
 {
     if (source == Py_None) {
         **obj = wxSize(-1,-1);
-        return True;
+        return true;
     }
     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
     }
     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
@@ -2325,7 +2385,7 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj)
 {
     if (source == Py_None) {
         **obj = wxPoint(-1,-1);
 {
     if (source == Py_None) {
         **obj = wxPoint(-1,-1);
-        return True;
+        return true;
     }
     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
     }
     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
@@ -2336,7 +2396,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 
     if (source == Py_None) {
         **obj = wxRealPoint(-1,-1);
 
     if (source == Py_None) {
         **obj = wxRealPoint(-1,-1);
-        return True;
+        return true;
     }
 
     // If source is an object instance then it may already be the right type
     }
 
     // If source is an object instance then it may already be the right type
@@ -2345,7 +2405,7 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint")))
             goto error;
         *obj = ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint")))
             goto error;
         *obj = ptr;
-        return True;
+        return true;
     }
     // otherwise a 2-tuple of floats is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
     }
     // otherwise a 2-tuple of floats is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 2) {
@@ -2359,12 +2419,12 @@ bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
         **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
         Py_DECREF(o1);
         Py_DECREF(o2);
         **obj = wxRealPoint(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
         Py_DECREF(o1);
         Py_DECREF(o2);
-        return True;
+        return true;
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxRealPoint object.");
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -2373,7 +2433,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) {
 
     if (source == Py_None) {
         **obj = wxRect(-1,-1,-1,-1);
 
     if (source == Py_None) {
         **obj = wxRect(-1,-1,-1,-1);
-        return True;
+        return true;
     }
 
     // If source is an object instance then it may already be the right type
     }
 
     // If source is an object instance then it may already be the right type
@@ -2382,7 +2442,7 @@ bool wxRect_helper(PyObject* source, wxRect** obj) {
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect")))
             goto error;
         *obj = ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect")))
             goto error;
         *obj = ptr;
-        return True;
+        return true;
     }
     // otherwise a 4-tuple of integers is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
     }
     // otherwise a 4-tuple of integers is expected
     else if (PySequence_Check(source) && PyObject_Length(source) == 4) {
@@ -2404,12 +2464,12 @@ bool wxRect_helper(PyObject* source, wxRect** obj) {
         Py_DECREF(o2);
         Py_DECREF(o3);
         Py_DECREF(o4);
         Py_DECREF(o2);
         Py_DECREF(o3);
         Py_DECREF(o4);
-        return True;
+        return true;
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
     }
 
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 4-tuple of integers or a wxRect object.");
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -2418,7 +2478,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
 
     if (source == Py_None) {
         **obj = wxNullColour;
 
     if (source == Py_None) {
         **obj = wxNullColour;
-        return True;
+        return true;
     }
 
     // If source is an object instance then it may already be the right type
     }
 
     // If source is an object instance then it may already be the right type
@@ -2427,7 +2487,7 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour")))
             goto error;
         *obj = ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour")))
             goto error;
         *obj = ptr;
-        return True;
+        return true;
     }
     // otherwise check for a string
     else if (PyString_Check(source) || PyUnicode_Check(source)) {
     }
     // otherwise check for a string
     else if (PyString_Check(source) || PyUnicode_Check(source)) {
@@ -2440,11 +2500,11 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
             spec.Mid(5,2).ToLong(&blue,  16);
 
             **obj = wxColour(red, green, blue);
             spec.Mid(5,2).ToLong(&blue,  16);
 
             **obj = wxColour(red, green, blue);
-            return True;
+            return true;
         }
         else {                                       // it's a colour name
             **obj = wxColour(spec);
         }
         else {                                       // it's a colour name
             **obj = wxColour(spec);
-            return True;
+            return true;
         }
     }
     // last chance: 3-tuple of integers is expected
         }
     }
     // last chance: 3-tuple of integers is expected
@@ -2462,25 +2522,25 @@ bool wxColour_helper(PyObject* source, wxColour** obj) {
         Py_DECREF(o1);
         Py_DECREF(o2);
         Py_DECREF(o3);
         Py_DECREF(o1);
         Py_DECREF(o2);
         Py_DECREF(o3);
-        return True;
+        return true;
     }
 
  error:
     PyErr_SetString(PyExc_TypeError,
                     "Expected a wxColour object or a string containing a colour name or '#RRGGBB'.");
     }
 
  error:
     PyErr_SetString(PyExc_TypeError,
                     "Expected a wxColour object or a string containing a colour name or '#RRGGBB'.");
-    return False;
+    return false;
 }
 
 
 bool wxColour_typecheck(PyObject* source) {
 
     if (wxPySimple_typecheck(source, wxT("wxColour"), 3))
 }
 
 
 bool wxColour_typecheck(PyObject* source) {
 
     if (wxPySimple_typecheck(source, wxT("wxColour"), 3))
-        return True;
+        return true;
 
     if (PyString_Check(source) || PyUnicode_Check(source))
 
     if (PyString_Check(source) || PyUnicode_Check(source))
-        return True;
+        return true;
 
 
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -2489,7 +2549,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
 
     if (source == Py_None) {
         **obj = wxPoint2D(-1,-1);
 
     if (source == Py_None) {
         **obj = wxPoint2D(-1,-1);
-        return True;
+        return true;
     }
 
     // If source is an object instance then it may already be the right type
     }
 
     // If source is an object instance then it may already be the right type
@@ -2498,7 +2558,7 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D")))
             goto error;
         *obj = ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D")))
             goto error;
         *obj = ptr;
-        return True;
+        return true;
     }
     // otherwise a length-2 sequence of floats is expected
     if (PySequence_Check(source) && PySequence_Length(source) == 2) {
     }
     // otherwise a length-2 sequence of floats is expected
     if (PySequence_Check(source) && PySequence_Length(source) == 2) {
@@ -2513,11 +2573,11 @@ bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
         **obj = wxPoint2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
         Py_DECREF(o1);
         Py_DECREF(o2);
         **obj = wxPoint2D(PyFloat_AsDouble(o1), PyFloat_AsDouble(o2));
         Py_DECREF(o1);
         Py_DECREF(o2);
-        return True;
+        return true;
     }
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object.");
     }
  error:
     PyErr_SetString(PyExc_TypeError, "Expected a 2-tuple of floats or a wxPoint2D object.");
-    return False;
+    return false;
 }
 
 
 }
 
 
@@ -2551,6 +2611,145 @@ PyObject* wxArrayInt2PyList_helper(const wxArrayInt& arr) {
 }
 
 
 }
 
 
+//----------------------------------------------------------------------
+// wxPyImageHandler methods
+//
+// TODO: Switch these to use wxPython's standard macros and helper classes
+//       for calling callbacks.
+
+PyObject* wxPyImageHandler::m_DoCanRead_Name = NULL;
+PyObject* wxPyImageHandler::m_GetImageCount_Name = NULL;
+PyObject* wxPyImageHandler::m_LoadFile_Name = NULL;
+PyObject* wxPyImageHandler::m_SaveFile_Name = NULL;
+
+PyObject* wxPyImageHandler::py_InputStream(wxInputStream* stream) {
+    return wxPyConstructObject(new wxPyInputStream(stream),
+                               wxT("wxPyInputStream"), 0);
+}
+
+PyObject* wxPyImageHandler::py_Image(wxImage* image) {
+    return wxPyConstructObject(image, wxT("wxImage"), 0);
+}
+
+PyObject* wxPyImageHandler::py_OutputStream(wxOutputStream* stream) {
+    return wxPyConstructObject(stream, wxT("wxOutputStream"), 0);
+}
+
+wxPyImageHandler::wxPyImageHandler():
+    m_self(NULL)
+{
+    if (!m_DoCanRead_Name) {
+        m_DoCanRead_Name = PyString_FromString("DoCanRead");
+        m_GetImageCount_Name = PyString_FromString("GetImageCount");
+        m_LoadFile_Name = PyString_FromString("LoadFile");
+        m_SaveFile_Name = PyString_FromString("SaveFile");
+    }
+}
+
+wxPyImageHandler::~wxPyImageHandler() {
+    if (m_self) {
+        Py_DECREF(m_self);
+        m_self = NULL;
+    }
+}
+
+void wxPyImageHandler::_SetSelf(PyObject *self) {
+    // should check here for isinstance(PyImageHandler) ??
+    m_self = self;
+    Py_INCREF(m_self);
+}
+
+bool wxPyImageHandler::DoCanRead(wxInputStream& stream) {
+    // check if our object has this method
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if (!m_self || !PyObject_HasAttr(m_self, m_DoCanRead_Name)) {
+        wxPyEndBlockThreads(blocked);
+        return false;
+    }
+
+    PyObject* res = PyObject_CallMethodObjArgs(m_self, m_DoCanRead_Name,
+                                               py_InputStream(&stream), NULL);
+    bool retval = false;
+    if (res) {
+        retval = PyInt_AsLong(res);
+        Py_DECREF(res);
+        PyErr_Clear();
+    }
+    else
+        PyErr_Print();
+    wxPyEndBlockThreads(blocked);
+    return retval;
+}
+
+bool wxPyImageHandler::LoadFile( wxImage* image, wxInputStream& stream,
+                                 bool verbose, int index ) {
+    // check if our object has this method
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if (!m_self || !PyObject_HasAttr(m_self, m_LoadFile_Name)) {
+        wxPyEndBlockThreads(blocked);
+        return false;
+    }
+    PyObject* res = PyObject_CallMethodObjArgs(m_self, m_LoadFile_Name,
+                                               py_Image(image),
+                                               py_InputStream(&stream),
+                                               PyInt_FromLong(verbose),
+                                               PyInt_FromLong(index),
+                                               NULL);
+    bool retval = false;
+    if (res) {
+        retval = PyInt_AsLong(res);
+        Py_DECREF(res);
+        PyErr_Clear();
+    } else
+        PyErr_Print();
+    wxPyEndBlockThreads(blocked);
+    return retval;
+}
+
+bool wxPyImageHandler::SaveFile( wxImage* image, wxOutputStream& stream,
+                                 bool verbose ) {
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if (!m_self || !PyObject_HasAttr(m_self, m_SaveFile_Name)) {
+        wxPyEndBlockThreads(blocked);
+        return false;
+    }
+    PyObject* res = PyObject_CallMethodObjArgs(m_self, m_SaveFile_Name,
+                                               py_Image(image),
+                                               py_OutputStream(&stream),
+                                               PyInt_FromLong(verbose),
+                                               NULL);
+    bool retval = false;
+    if(res) {
+        retval=PyInt_AsLong(res);
+        Py_DECREF(res);
+        PyErr_Clear();
+    } else
+        PyErr_Print();
+    wxPyEndBlockThreads(blocked);
+    return retval;
+}
+
+int wxPyImageHandler::GetImageCount( wxInputStream& stream ) {
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if (!m_self || !PyObject_HasAttr(m_self, m_GetImageCount_Name)) {
+        wxPyEndBlockThreads(blocked);
+        return 1;
+    }
+    PyObject *res=PyObject_CallMethodObjArgs(m_self, m_GetImageCount_Name,
+                                             py_InputStream(&stream),
+                                             NULL);
+    int retval = 1;
+    if(res) {
+        retval=PyInt_AsLong(res);
+        Py_DECREF(res);
+        PyErr_Clear();
+    } else
+        PyErr_Print();
+    wxPyEndBlockThreads(blocked);
+    return retval;
+}
+
+
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------
 
wxWidgets (Impactor)