Use static method for AddCatalogLookupPathPrefix instead of global function

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 18081078e99b9e7c7cfdb8317fd45876bcf0eb6f..c10641926d0f3e387292d30975a5bacac2059c23 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -23,9 +23,24 @@
 #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__
+#include <wx/mac/private.h>

 #endif
 
 #include <wx/clipbrd.h>
 #endif
 
 #include <wx/clipbrd.h>


@@ -34,25 +49,24 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#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
 struct wxPyThreadState {
     unsigned long  tid;
     PyThreadState* tstate;
 
 
 #ifdef WXP_WITH_THREAD
 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>


@@ -67,6 +81,7 @@ wxMutex*              wxPyTMutex = NULL;
 
 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;
 


@@ -86,7 +101,7 @@ BOOL WINAPI DllMain(
     // the inatance has already been set.
     if (! wxGetInstance())
         wxSetInstance(hinstDLL);
     // the inatance has already been set.
     if (! wxGetInstance())
         wxSetInstance(hinstDLL);

-    return True;
+    return true;

 }
 #endif
 
 }
 #endif
 


@@ -99,7 +114,7 @@ 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;

 }
 
 
 }
 
 


@@ -109,7 +124,7 @@ wxPyApp::~wxPyApp() {
 
 // 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;

 }
 
 
 }
 
 


@@ -131,22 +146,22 @@ 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();  
+    bool 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();
+    bool 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;
 }


@@ -170,11 +185,11 @@ void wxPyApp::OnAssert(const wxChar *file,
         }
         wxLogDebug(buf);
         return;
         }
         wxLogDebug(buf);
         return;

-    }        
-        
+    }
+

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


@@ -189,7 +204,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) {


@@ -208,11 +223,11 @@ void wxPyApp::OnAssert(const wxChar *file,
             }
 
             // set the exception
             }
 
             // set the exception

-            wxPyBeginBlockThreads();
+            bool 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


@@ -240,6 +255,44 @@ void wxPyApp::OnAssert(const wxChar *file,
 }
 #endif
 
 }
 #endif
 

+    // For catching Apple Events
+void wxPyApp::MacOpenFile(const wxString &fileName)
+{
+    bool blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
+        PyObject* s = wx2PyString(fileName);
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
+        Py_DECREF(s);
+    }
+    wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacPrintFile(const wxString &fileName)
+{
+    bool blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
+        PyObject* s = wx2PyString(fileName);
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
+        Py_DECREF(s);
+    }
+    wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacNewFile()
+{
+    bool blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
+    wxPyEndBlockThreads(blocked);
+}
+
+void wxPyApp::MacReopenApp()
+{
+    bool blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
+    wxPyEndBlockThreads(blocked);
+}

 
 
 /*static*/
 
 
 /*static*/


@@ -327,46 +380,68 @@ 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()
 {

-    bool        result;
+    static      bool haveInitialized = false;
+    bool        result, 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");
+        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);
+            }
+            argv[argc] = NULL;

         }
         }

-        argv[argc] = NULL;
-    }
-    wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

 
 

-    result = wxEntryStart(argc, argv);
-    delete [] argv;
-    
-    wxPyBeginBlockThreads();
-    if (! result)  {
-        PyErr_SetString(PyExc_SystemError, "wxEntryStart failed!");
-        goto error;
-    }
+        // Initialize wxWidgets
+        result = wxEntryStart(argc, argv);
+        delete [] argv;

 
 

-    // The stock objects were all NULL when they were loaded into
-    // SWIG generated proxies, so re-init those now...
-    wxPy_ReinitStockObjects(3);
+        blocked = wxPyBeginBlockThreads();
+        if (! result)  {
+            PyErr_SetString(PyExc_SystemError,
+                            "wxEntryStart failed, unable to initialize wxWidgets!"
+#ifdef __WXGTK__
+                            "  (Is DISPLAY set properly?)"
+#endif
+                );
+            goto error;
+        }

 
 

-    // It's now ok to generate exceptions for assertion errors.
-    wxPythonApp->SetStartupComplete(True);
+        // 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
+    
+        // The stock objects were all NULL when they were loaded into
+        // SWIG generated proxies, so re-init those now...
+        wxPy_ReinitStockObjects(3);
+
+        wxPyEndBlockThreads(blocked);
+        haveInitialized = true;
+    }

     
     

+    // It's now ok to generate exceptions for assertion errors.
+    wxPythonApp->SetStartupComplete(true);
+

     // Call the Python wxApp's OnInit function
     // Call the Python wxApp's OnInit function

-    if (wxPyCBH_findCallback(m_myInst, "OnInit")) {                
+    blocked = wxPyBeginBlockThreads();
+    if (wxPyCBH_findCallback(m_myInst, "OnInit")) {

 
         PyObject* method = m_myInst.GetLastFound();
         PyObject* argTuple = PyTuple_New(0);
 
         PyObject* method = m_myInst.GetLastFound();
         PyObject* argTuple = PyTuple_New(0);


@@ -375,8 +450,8 @@ void wxPyApp::_BootstrapApp()
         Py_DECREF(method);
         if (retval == NULL)
             goto error;
         Py_DECREF(method);
         if (retval == NULL)
             goto error;

-        
-        pyint = PyNumber_Int(retval);        
+
+        pyint = PyNumber_Int(retval);

         if (! pyint) {
             PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
             goto error;
         if (! pyint) {
             PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value");
             goto error;


@@ -385,19 +460,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);

 };
 
 //---------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------


@@ -449,14 +523,17 @@ 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


@@ -474,14 +551,16 @@ void __wxPyPreStart(PyObject* moduleDict)
 
     // Init the stock objects to a non-NULL value so SWIG doesn't create them as None
     wxPy_ReinitStockObjects(1);
 
     // 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


@@ -494,7 +573,7 @@ void __wxPyCleanup() {
 }
 
 
 }
 
 

-// 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)
 {


@@ -503,7 +582,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;
     }
 


@@ -512,25 +592,36 @@ 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__"

+#define wxPlatName "wxMotif"

 #endif
 #ifdef __WXX11__
 #define wxPlatform "__WXX11__"
 #endif
 #ifdef __WXX11__
 #define wxPlatform "__WXX11__"

+#define wxPlatName "wxX11"

 #endif
 #ifdef __WXGTK__
 #define wxPlatform "__WXGTK__"
 #endif
 #ifdef __WXGTK__
 #define wxPlatform "__WXGTK__"

+#define wxPlatName "wxGTK"

 #endif
 #endif

-#if defined(__WIN32__) || defined(__WXMSW__)
+#ifdef __WXMSW__

 #define wxPlatform "__WXMSW__"
 #define wxPlatform "__WXMSW__"

+#define wxPlatName "wxMSW"

 #endif
 #ifdef __WXMAC__
 #define wxPlatform "__WXMAC__"
 #endif
 #ifdef __WXMAC__
 #define wxPlatform "__WXMAC__"

+#define wxPlatName "wxMac"

 #endif
 
 #ifdef __WXDEBUG__
 #endif
 
 #ifdef __WXDEBUG__


@@ -539,10 +630,46 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     int wxdebug = 0;
 #endif
 
     int wxdebug = 0;
 #endif
 

+    // These should be deprecated in favor of the PlatformInfo tuple built below...

     PyDict_SetItemString(wxPython_dict, "Platform", PyString_FromString(wxPlatform));
     PyDict_SetItemString(wxPython_dict, "USE_UNICODE", PyInt_FromLong(wxUSE_UNICODE));
     PyDict_SetItemString(wxPython_dict, "__WXDEBUG__", PyInt_FromLong(wxdebug));
 
     PyDict_SetItemString(wxPython_dict, "Platform", PyString_FromString(wxPlatform));
     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;
+
+#define _AddInfoString(st) \
+    obj = PyString_FromString(st); \
+    PyList_Append(PlatInfo, obj); \
+    Py_DECREF(obj)
+
+    _AddInfoString(wxPlatform);
+    _AddInfoString(wxPlatName);
+#if wxUSE_UNICODE
+    _AddInfoString("unicode");
+#else
+    _AddInfoString("ansi");
+#endif
+#ifdef __WXGTK__
+#ifdef __WXGTK20__
+    _AddInfoString("gtk2");
+#else
+    _AddInfoString("gtk1");
+#endif
+#endif
+#ifdef __WXDEBUG__
+    _AddInfoString("wx-assertions-on");
+#else
+    _AddInfoString("wx-assertions-off");
+#endif
+    
+#undef _AddInfoString
+
+    PyObject* PlatInfoTuple = PyList_AsTuple(PlatInfo);
+    Py_DECREF(PlatInfo);
+    PyDict_SetItemString(wxPython_dict, "PlatformInfo", PlatInfoTuple);
+    

     RETURN_NONE();
 }
 
     RETURN_NONE();
 }
 


@@ -565,25 +692,25 @@ bool wxPySwigInstance_Check(PyObject* obj) {
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-// The stock objects are no longer created when the wxc module is imported,
-// but only after the app object has been created.  The
+// The stock objects are no longer created when the wx._core_ 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
 // 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.)
+//           object will be created (otherwise SWIG 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 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.
+//   pass 3: Finally, from BootstrapApp patch things up so the stock objects
+//           can be used.

 
 
 PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args)
 {
 
 
 PyObject* __wxPyFixStockObjects(PyObject* /* self */, PyObject* args)
 {

-    wxPy_ReinitStockObjects(2);    
+    wxPy_ReinitStockObjects(2);

     RETURN_NONE();
 }
 
     RETURN_NONE();
 }
 


@@ -592,7 +719,7 @@ static void rsoPass2(const char* name)
 {
     static PyObject* unbornObjectClass = NULL;
     PyObject* obj;
 {
     static PyObject* unbornObjectClass = NULL;
     PyObject* obj;

-    
+

     if (unbornObjectClass == NULL) {
         unbornObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyUnbornObject");
         Py_INCREF(unbornObjectClass);
     if (unbornObjectClass == NULL) {
         unbornObjectClass = PyDict_GetItemString(wxPython_dict, "_wxPyUnbornObject");
         Py_INCREF(unbornObjectClass);


@@ -605,7 +732,7 @@ static void rsoPass2(const char* name)
 
     // Change its class
     PyObject_SetAttrString(obj, "__class__",  unbornObjectClass);
 
     // Change its class
     PyObject_SetAttrString(obj, "__class__",  unbornObjectClass);

-   
+

 }
 
 static void rsoPass3(const char* name, const char* classname, void* ptr)
 }
 
 static void rsoPass3(const char* name, const char* classname, void* ptr)


@@ -616,17 +743,17 @@ static void rsoPass3(const char* name, const char* classname, void* ptr)
 
     // Find the object instance
     obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));
 
     // Find the object instance
     obj = PyDict_GetItemString(wxPython_dict, (char*)dropwx(name));

-    wxCHECK_RET(obj != NULL, wxT("Unable to find stock object")); 
+    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(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")); 
+    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, "__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); 
+    PyObject_SetAttrString(obj, "this", ptrobj);

     Py_DECREF(ptrobj);
 }
 
     Py_DECREF(ptrobj);
 }
 


@@ -635,6 +762,17 @@ static void rsoPass3(const char* name, const char* classname, void* ptr)
 void wxPy_ReinitStockObjects(int pass)
 {
 
 void wxPy_ReinitStockObjects(int pass)
 {
 

+    // If there is already an App object then wxPython is probably embedded in
+    // a wx C++ application, so there is no need to do all this.
+    static bool embedded = false;
+    if ((pass == 1 || pass == 2) && wxTheApp) {
+        embedded = true;
+        return;
+    }
+    if (pass == 3 && embedded)
+        return;
+
+

 #define REINITOBJ(name, classname) \
     if (pass == 1) { name = (classname*)0xC0C0C0C0; } \
     else if (pass == 2) { rsoPass2(#name); } \
 #define REINITOBJ(name, classname) \
     if (pass == 1) { name = (classname*)0xC0C0C0C0; } \
     else if (pass == 2) { rsoPass2(#name); } \


@@ -645,7 +783,7 @@ void wxPy_ReinitStockObjects(int pass)
     if (pass == 1) { } \
     else if (pass == 2) { rsoPass2(#name); } \
     else if (pass == 3) { rsoPass3(#name, #classname, (void*)&name); }
     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(wxNORMAL_FONT, wxFont);
     REINITOBJ(wxSMALL_FONT, wxFont);


@@ -701,7 +839,6 @@ void wxPy_ReinitStockObjects(int pass)
     REINITOBJ(wxTheColourDatabase, wxColourDatabase);
 
 
     REINITOBJ(wxTheColourDatabase, wxColourDatabase);
 
 

-    REINITOBJ(wxTheClipboard, wxClipboard);

     REINITOBJ2(wxDefaultValidator, wxValidator);
     REINITOBJ2(wxNullImage, wxImage);
     REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable);
     REINITOBJ2(wxDefaultValidator, wxValidator);
     REINITOBJ2(wxNullImage, wxImage);
     REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable);


@@ -712,22 +849,38 @@ void wxPy_ReinitStockObjects(int pass)
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+// 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.
+
+bool wxPyCheckForApp() {
+    if (wxTheApp != NULL)
+        return true;
+    else {
+        PyErr_SetString(wxPyNoAppError, "The wx.App object must be created first!");
+        return false;
+    }
+}
+
+//---------------------------------------------------------------------------
+
+

 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();
+        bool blocked = wxPyBeginBlockThreads();

         Py_DECREF(self->m_obj);
         self->m_obj = NULL;
         Py_DECREF(self->m_obj);
         self->m_obj = NULL;

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 }
 
 void wxPyUserData_dtor(wxPyUserData* self) {
     if (! wxPyDoingCleanup) {
     }
 }
 
 void wxPyUserData_dtor(wxPyUserData* self) {
     if (! wxPyDoingCleanup) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         Py_DECREF(self->m_obj);
         self->m_obj = NULL;
         Py_DECREF(self->m_obj);
         self->m_obj = NULL;

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

     }
 }
 
     }
 }
 


@@ -744,7 +897,7 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
 
     static PyObject* deadObjectClass = NULL;
 
 
     static PyObject* deadObjectClass = NULL;
 

-    wxPyBeginBlockThreads();
+    bool 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,


@@ -770,10 +923,10 @@ void wxPyOORClientData_dtor(wxPyOORClientData* self) {
         if (PyErr_Occurred())
             PyErr_Clear();      // just ignore it for now
 
         if (PyErr_Occurred())
             PyErr_Clear();      // just ignore it for now
 

-        
+

         PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__");
         if (dict) {
         PyObject* dict = PyObject_GetAttrString(self->m_obj, "__dict__");
         if (dict) {

-            // Clear the instance's dictionary 
+            // Clear the instance's dictionary

             PyDict_Clear(dict);
 
             // put the name of the old class into the instance, and then reset the
             PyDict_Clear(dict);
 
             // put the name of the old class into the instance, and then reset the


@@ -789,7 +942,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);

 }
 
 
 }
 
 


@@ -814,16 +967,16 @@ 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;

 
     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) {


@@ -847,7 +1000,7 @@ 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));
             } else {
                 if (target && isEvtHandler)
                     ((wxEvtHandler*)source)->SetClientObject(new wxPyOORClientData(target));
             } else {


@@ -864,7 +1017,7 @@ PyObject*  wxPyMake_wxObject(wxObject* source, bool checkEvtHandler) {
 }
 
 
 }
 
 

-PyObject*  wxPyMake_wxSizer(wxSizer* source) {
+PyObject*  wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) {

     PyObject* target = NULL;
 
     if (source && wxIsKindOf(source, wxSizer)) {
     PyObject* target = NULL;
 
     if (source && wxIsKindOf(source, wxSizer)) {


@@ -879,7 +1032,7 @@ PyObject*  wxPyMake_wxSizer(wxSizer* source) {
         }
     }
     if (! target) {
         }
     }
     if (! target) {

-        target = wxPyMake_wxObject(source, False);
+        target = wxPyMake_wxObject(source, setThisOwn, false);

         if (target != Py_None)
             ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target));
     }
         if (target != Py_None)
             ((wxSizer*)source)->SetClientObject(new wxPyOORClientData(target));
     }


@@ -935,11 +1088,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;
         }


@@ -960,7 +1114,6 @@ PyThreadState* wxPyBeginAllowThreads() {
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
     wxPySaveThreadState(saved);
 #ifdef WXP_WITH_THREAD
     PyThreadState* saved = PyEval_SaveThread();  // Py_BEGIN_ALLOW_THREADS;
     wxPySaveThreadState(saved);

-    wxPyGetThreadState()->blocked -= 1;

     return saved;
 #else
     return NULL;
     return saved;
 #else
     return NULL;


@@ -969,7 +1122,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
 }


@@ -979,21 +1131,33 @@ 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() {
+bool wxPyBeginBlockThreads() {

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

+    // This works in for 2.3, maybe a good alternative to find the needed tstate?
+    // PyThreadState *check = PyGILState_GetThisThreadState();  
+
+    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
+    bool 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
 }
 
 
 #endif
 }
 
 

-void wxPyEndBlockThreads() {
+void wxPyEndBlockThreads(bool 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
+    // 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


@@ -1016,7 +1180,7 @@ 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() {


@@ -1033,9 +1197,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();
+        bool 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;
     }
 


@@ -1052,7 +1216,7 @@ PyObject* wxPyInputStream::read(int size) {
     }
 
     // error check
     }
 
     // error check

-    wxPyBeginBlockThreads();
+    bool 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");


@@ -1061,7 +1225,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;
 }
 


@@ -1074,9 +1238,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();
+        bool 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;
     }
 


@@ -1087,7 +1251,7 @@ PyObject* wxPyInputStream::readline(int size) {
     }
 
     // errorcheck
     }
 
     // errorcheck

-    wxPyBeginBlockThreads();
+    bool 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");


@@ -1096,7 +1260,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;
 }
 


@@ -1106,19 +1270,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();
+        bool 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();
+    bool blocked = wxPyBeginBlockThreads();

     pylist = PyList_New(0);
     pylist = PyList_New(0);

+    wxPyEndBlockThreads(blocked);
+    

     if (!pylist) {
     if (!pylist) {

-        wxPyBeginBlockThreads();
+        bool blocked = wxPyBeginBlockThreads();

         PyErr_NoMemory();
         PyErr_NoMemory();

-        wxPyEndBlockThreads();
+        wxPyEndBlockThreads(blocked);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -1127,24 +1293,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();
+            bool blocked = wxPyBeginBlockThreads();

             Py_DECREF(pylist);
             Py_DECREF(pylist);

-            wxPyEndBlockThreads();
+            wxPyEndBlockThreads(blocked);

             return NULL;
         }
             return NULL;
         }

-        wxPyBeginBlockThreads();
+        bool 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();
+        bool 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;
     }
 


@@ -1172,16 +1338,18 @@ wxPyCBInputStream::wxPyCBInputStream(PyObject *r, PyObject *s, PyObject *t, bool
 
 
 wxPyCBInputStream::~wxPyCBInputStream() {
 
 
 wxPyCBInputStream::~wxPyCBInputStream() {

-    if (m_block) wxPyBeginBlockThreads();
+    bool blocked=false;
+    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();
+    bool blocked=false;
+    if (block) blocked = wxPyBeginBlockThreads();

 
     PyObject* read = getMethod(py, "read");
     PyObject* seek = getMethod(py, "seek");
 
     PyObject* read = getMethod(py, "read");
     PyObject* seek = getMethod(py, "seek");


@@ -1192,11 +1360,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);
 }
 


@@ -1217,16 +1385,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;

 }
 
 
 }
 
 


@@ -1234,7 +1402,7 @@ size_t wxPyCBInputStream::OnSysRead(void *buffer, size_t bufsize) {
     if (bufsize == 0)
         return 0;
 
     if (bufsize == 0)
         return 0;
 

-    wxPyBeginBlockThreads();
+    bool 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);


@@ -1252,7 +1420,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;
 }
 


@@ -1261,10 +1429,10 @@ 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...
+wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
+    bool blocked = wxPyBeginBlockThreads();
+#if defined( __WINCE__) || defined(_LARGE_FILES) || wxHAS_HUGE_FILES
+    // wxFileOffset is a 64-bit value...

     PyObject* arglist = Py_BuildValue("(Li)", off, mode);
 #else
     PyObject* arglist = Py_BuildValue("(ii)", off, mode);
     PyObject* arglist = Py_BuildValue("(Li)", off, mode);
 #else
     PyObject* arglist = Py_BuildValue("(ii)", off, mode);


@@ -1272,19 +1440,19 @@ off_t wxPyCBInputStream::OnSysSeek(off_t off, wxSeekMode 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 {
+    bool 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 defined( __WINCE__) || defined(_LARGE_FILES) || wxHAS_HUGE_FILES

         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else
         if (PyLong_Check(result))
             o = PyLong_AsLongLong(result);
         else


@@ -1292,7 +1460,7 @@ off_t wxPyCBInputStream::OnSysTell() const {
             o = PyInt_AsLong(result);
         Py_DECREF(result);
     };
             o = PyInt_AsLong(result);
         Py_DECREF(result);
     };

-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);

     return o;
 }
 
     return o;
 }
 


@@ -1311,12 +1479,14 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
 }
 
 wxPyCallback::~wxPyCallback() {
 }
 
 wxPyCallback::~wxPyCallback() {

-    wxPyBeginBlockThreads();
+    bool 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) {


@@ -1325,9 +1495,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();
+    bool 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


@@ -1347,6 +1517,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
+        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();
+            }            
+        }
+        

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


@@ -1358,6 +1547,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


@@ -1372,7 +1572,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
         }
         Py_DECREF(tuple);
     }
         }
         Py_DECREF(tuple);
     }

-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);

 }
 
 
 }
 
 


@@ -1507,7 +1707,7 @@ bool wxPyCallbackHelper::findCallback(const char* name) const {
 
 int wxPyCallbackHelper::callCallback(PyObject* argTuple) const {
     PyObject*   result;
 
 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...


@@ -1557,10 +1757,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();
+        bool 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);

     }
 }
 
     }
 }
 


@@ -1574,26 +1774,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();
+    bool 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();
+    bool 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 {


@@ -1614,7 +1814,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);

 }
 
 
 }
 
 


@@ -1630,7 +1830,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);

 }
 
 
 }
 
 


@@ -1652,38 +1852,35 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) {
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 

-    wxPyBeginBlockThreads();
+    bool 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;
 }
 
 //----------------------------------------------------------------------
 
 long wxPyGetWinHandle(wxWindow* win) {
     return pyList;
 }
 
 //----------------------------------------------------------------------
 
 long wxPyGetWinHandle(wxWindow* win) {

+

 #ifdef __WXMSW__
     return (long)win->GetHandle();
 #endif
 
 #ifdef __WXMSW__
     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;
-        }
+#if defined(__WXGTK__) || defined(__WXX11)
+    return (long)GetXWindow(win);

 #endif
 #endif

-    }
+    
+#ifdef __WXMAC__
+    //return (long)MAC_WXHWND(win->MacGetTopLevelWindowRef());
+    return (long)win->GetHandle();

 #endif
 #endif

+

     return 0;
 }
 
     return 0;
 }
 


@@ -1691,50 +1888,43 @@ 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_FromObject(source);
+        if (PyErr_Occurred()) return NULL;

     }
     }

-#else
-    char* tmpPtr; int tmpSize;
-    if (PyString_AsStringAndSize(source, &tmpPtr, &tmpSize) == -1) {
-        PyErr_SetString(PyExc_TypeError, "Unable to convert string");
-        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);

     }
     }

-    target = new wxString(tmpPtr, tmpSize);
-#endif // wxUSE_UNICODE

 
 

-#else  // No Python unicode API (1.5.2)
+    if (PyString_Check(source))
+        Py_DECREF(uni);
+#else
+    // Convert to a string object if it isn't already, then to wxString
+    PyObject* str = source;

     if (!PyString_Check(source)) {
     if (!PyString_Check(source)) {

-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
+        str = PyObject_Str(source);
+        if (PyErr_Occurred()) return NULL;

     }
     }

-    target = new wxString(PyString_AS_STRING(source), PyString_GET_SIZE(source));
-#endif
+    char* tmpPtr; int tmpSize;
+    PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
+    target = new wxString(tmpPtr, tmpSize);
+    
+    if (!PyString_Check(source))
+        Py_DECREF(str);
+#endif // wxUSE_UNICODE
+    

     return target;
 }
 
     return target;
 }
 


@@ -1743,45 +1933,37 @@ 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
 
 #if wxUSE_UNICODE

-    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);
+    // Convert to a unicode object, if not already, then to a wxString
+    PyObject* uni = source;
+    if (!PyUnicode_Check(source)) {
+        uni = PyUnicode_FromObject(source);
+        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 (!PyUnicode_Check(source))
+        Py_DECREF(uni);

 #else
 #else

+    // Convert to a string object if it isn't already, then to wxString
+    PyObject* str = source;
+    if (!PyString_Check(source)) {
+        str = PyObject_Str(source);
+        if (PyErr_Occurred()) return wxEmptyString;    // TODO:  should we PyErr_Clear?
+    }

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

+    
+    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)) {
-        // 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 (doDecRef)
-        Py_DECREF(source);

     return target;
 }
 
     return target;
 }
 


@@ -1899,24 +2081,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;

 }
 
 
 }
 
 


@@ -2142,7 +2324,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);


@@ -2160,7 +2342,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;

 }
 
 
 }
 
 


@@ -2169,7 +2351,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);


@@ -2195,7 +2377,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;

 }
 
 
 }
 
 


@@ -2204,26 +2386,34 @@ bool wxPy4int_seq_helper(PyObject* source, int* i1, int* i2, int* i3, int* i4) {
 bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
 {
     void* ptr;
 bool wxPySimple_typecheck(PyObject* source, const wxChar* classname, int seqLen)
 {
     void* ptr;

-    
+

     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 False;
-}    
+        return true;
+
+    return false;
+}

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

+    if (source == Py_None) {
+        **obj = wxSize(-1,-1);
+        return true;
+    }

     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
 
 
 bool wxPoint_helper(PyObject* source, wxPoint** obj)
 {
     return wxPyTwoIntItem_helper(source, obj, wxT("wxSize"));
 }
 
 
 bool wxPoint_helper(PyObject* source, wxPoint** obj)
 {

+    if (source == Py_None) {
+        **obj = wxPoint(-1,-1);
+        return true;
+    }

     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
 
     return wxPyTwoIntItem_helper(source, obj, wxT("wxPoint"));
 }
 


@@ -2231,13 +2421,18 @@ bool wxPoint_helper(PyObject* source, wxPoint** obj)
 
 bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 
 
 bool wxRealPoint_helper(PyObject* source, wxRealPoint** obj) {
 

+    if (source == Py_None) {
+        **obj = wxRealPoint(-1,-1);
+        return true;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRealPoint* ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRealPoint")))
             goto error;
         *obj = ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRealPoint* 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) {


@@ -2251,25 +2446,30 @@ 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;

 }
 
 
 
 bool wxRect_helper(PyObject* source, wxRect** obj) {
 
 }
 
 
 
 bool wxRect_helper(PyObject* source, wxRect** obj) {
 

+    if (source == Py_None) {
+        **obj = wxRect(-1,-1,-1,-1);
+        return true;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRect* ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxRect")))
             goto error;
         *obj = ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxRect* 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) {


@@ -2291,25 +2491,30 @@ 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;

 }
 
 
 
 bool wxColour_helper(PyObject* source, wxColour** obj) {
 
 }
 
 
 
 bool wxColour_helper(PyObject* source, wxColour** obj) {
 

+    if (source == Py_None) {
+        **obj = wxNullColour;
+        return true;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxColour* ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxColour")))
             goto error;
         *obj = ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxColour* 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)) {


@@ -2322,11 +2527,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


@@ -2344,37 +2549,43 @@ 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 False;   
+        return true;
+
+    return false;

 }
 
 
 
 bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {
 }
 
 
 
 bool wxPoint2D_helper(PyObject* source, wxPoint2D** obj) {

+
+    if (source == Py_None) {
+        **obj = wxPoint2D(-1,-1);
+        return true;
+    }
+

     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxPoint2D* ptr;
         if (! wxPyConvertSwigPtr(source, (void **)&ptr, wxT("wxPoint2D")))
             goto error;
         *obj = ptr;
     // If source is an object instance then it may already be the right type
     if (wxPySwigInstance_Check(source)) {
         wxPoint2D* 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) {


@@ -2389,11 +2600,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;

 }
 
 
 }