Added autoconf makefiles for FoldBar extended samples

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

diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp
index 694c5f478010dd2689e994ecf95855b638bd1f5a..b5ad3f8f6b8a241c84b5ba0a24e78f4923fd6e20 100644 (file)
--- a/wxPython/src/helpers.cpp
+++ b/wxPython/src/helpers.cpp
@@ -61,6 +61,7 @@ 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;


@@ -76,9 +77,14 @@ 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* wxPyNoAppError = NULL;
 static PyObject* wxPython_dict = NULL;
 static PyObject* wxPyAssertionError = NULL;
 static PyObject* wxPyNoAppError = NULL;


@@ -97,8 +103,8 @@ BOOL WINAPI DllMain(
     LPVOID      lpvReserved  // reserved
    )
 {
     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);
     return true;
     if (! wxGetInstance())
         wxSetInstance(hinstDLL);
     return true;


@@ -148,7 +154,7 @@ int  wxPyApp::MainLoop() {
 bool wxPyApp::OnInitGui() {
     bool rval=true;
     wxApp::OnInitGui();  // in this case always call the base class version
 bool wxPyApp::OnInitGui() {
     bool rval=true;
     wxApp::OnInitGui();  // in this case always call the base class version

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

     if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);
     if (wxPyCBH_findCallback(m_myInst, "OnInitGui"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);


@@ -158,7 +164,7 @@ bool wxPyApp::OnInitGui() {
 
 int wxPyApp::OnExit() {
     int rval=0;
 
 int wxPyApp::OnExit() {
     int rval=0;

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

     if (wxPyCBH_findCallback(m_myInst, "OnExit"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);
     if (wxPyCBH_findCallback(m_myInst, "OnExit"))
         rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);


@@ -189,7 +195,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;

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


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

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


@@ -258,7 +264,7 @@ 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)
 {

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

     if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
     if (wxPyCBH_findCallback(m_myInst, "MacOpenFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));


@@ -269,7 +275,7 @@ void wxPyApp::MacOpenFile(const wxString &fileName)
 
 void wxPyApp::MacPrintFile(const wxString &fileName)
 {
 
 void wxPyApp::MacPrintFile(const wxString &fileName)
 {

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

     if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));
     if (wxPyCBH_findCallback(m_myInst, "MacPrintFile")) {
         PyObject* s = wx2PyString(fileName);
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("(O)", s));


@@ -280,7 +286,7 @@ void wxPyApp::MacPrintFile(const wxString &fileName)
 
 void wxPyApp::MacNewFile()
 {
 
 void wxPyApp::MacNewFile()
 {

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

     if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);
     if (wxPyCBH_findCallback(m_myInst, "MacNewFile"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);


@@ -288,7 +294,7 @@ void wxPyApp::MacNewFile()
 
 void wxPyApp::MacReopenApp()
 {
 
 void wxPyApp::MacReopenApp()
 {

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

     if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);
     if (wxPyCBH_findCallback(m_myInst, "MacReopenApp"))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);


@@ -381,25 +387,30 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) {
 void wxPyApp::_BootstrapApp()
 {
     static      bool haveInitialized = false;
 void wxPyApp::_BootstrapApp()
 {
     static      bool haveInitialized = false;

-    bool        result, blocked;
+    bool        result;
+    wxPyBlock_t     blocked;

     PyObject*   retval = NULL;
     PyObject*   pyint  = NULL;
 
     PyObject*   retval = NULL;
     PyObject*   pyint  = NULL;
 

-    
+

     // Only initialize wxWidgets once
     if (! haveInitialized) {
     // 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();
         // 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* sysargv = PySys_GetObject("argv");

-        if (sysargv != NULL) {
-            argc = PyList_Size(sysargv);
+        PyObject* executable = PySys_GetObject("executable");
+        
+        if (sysargv != NULL && executable != NULL) {
+            argc = PyList_Size(sysargv) + 1;

             argv = new char*[argc+1];
             argv = new char*[argc+1];

+            argv[0] = PyString_AsString(executable);

             int x;
             int x;

-            for(x=0; x<argc; x++) {
-                PyObject *pyArg = PyList_GetItem(sysargv, x);
+            for(x=1; x<argc; x++) {
+                PyObject *pyArg = PyList_GetItem(sysargv, x-1);

                 argv[x] = PyString_AsString(pyArg);
             }
             argv[argc] = NULL;
                 argv[x] = PyString_AsString(pyArg);
             }
             argv[argc] = NULL;


@@ -427,7 +438,7 @@ void wxPyApp::_BootstrapApp()
 #if defined(__WXGTK__) && PY_VERSION_HEX < 0x02040000
         setlocale(LC_NUMERIC, "C");
 #endif
 #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);
         // The stock objects were all NULL when they were loaded into
         // SWIG generated proxies, so re-init those now...
         wxPy_ReinitStockObjects(3);


@@ -435,7 +446,7 @@ void wxPyApp::_BootstrapApp()
         wxPyEndBlockThreads(blocked);
         haveInitialized = true;
     }
         wxPyEndBlockThreads(blocked);
         haveInitialized = true;
     }

-    
+

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


@@ -532,11 +543,14 @@ void __wxPyPreStart(PyObject* moduleDict)
 #ifdef __WXMSW__
 //     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF
 //                     | _CRTDBG_CHECK_ALWAYS_DF
 #ifdef __WXMSW__
 //     wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF
 //                     | _CRTDBG_CHECK_ALWAYS_DF

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


@@ -544,6 +558,7 @@ 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
 #endif
 
     // Ensure that the build options in the DLL (or whatever) match this build


@@ -564,12 +579,14 @@ void __wxPyCleanup() {
         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

 }
 
 
 }
 
 


@@ -600,7 +617,7 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
     wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError",
                                         PyExc_RuntimeError, NULL);
     PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError);
     wxPyNoAppError = PyErr_NewException("wx._core.PyNoAppError",
                                         PyExc_RuntimeError, NULL);
     PyDict_SetItemString(wxPython_dict, "PyNoAppError", wxPyNoAppError);

-    
+

 
 
 #ifdef __WXMOTIF__
 
 
 #ifdef __WXMOTIF__


@@ -663,13 +680,13 @@ PyObject* __wxPySetDictionary(PyObject* /* self */, PyObject* args)
 #else
     _AddInfoString("wx-assertions-off");
 #endif
 #else
     _AddInfoString("wx-assertions-off");
 #endif

-    
+

 #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();
 }
 
     RETURN_NONE();
 }
 


@@ -783,7 +800,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);


@@ -864,27 +881,30 @@ bool wxPyCheckForApp() {
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-
-void wxPyClientData_dtor(wxPyClientData* self) {
-    if (! wxPyDoingCleanup) {           // Don't do it during cleanup as Python
-                                        // may have already garbage collected the object...
-        bool blocked = wxPyBeginBlockThreads();
+void wxPyUserData_dtor(wxPyUserData* self) {
+    if (! wxPyDoingCleanup) {
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         Py_DECREF(self->m_obj);
         self->m_obj = NULL;
         wxPyEndBlockThreads(blocked);
     }
 }
 
         Py_DECREF(self->m_obj);
         self->m_obj = NULL;
         wxPyEndBlockThreads(blocked);
     }
 }
 

-void wxPyUserData_dtor(wxPyUserData* self) {
-    if (! wxPyDoingCleanup) {
-        bool blocked = wxPyBeginBlockThreads();
-        Py_DECREF(self->m_obj);
+
+void wxPyClientData_dtor(wxPyClientData* self) {
+    if (! wxPyDoingCleanup) {           // Don't do it during cleanup as Python
+                                        // may have already garbage collected the object...
+        if (self->m_incRef) {
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
+            Py_DECREF(self->m_obj);
+            wxPyEndBlockThreads(blocked);
+        }

         self->m_obj = NULL;
         self->m_obj = NULL;

-        wxPyEndBlockThreads(blocked);

     }
 }
 
 
     }
 }
 
 

+

 // This is called when an OOR controled object is being destroyed.  Although
 // the C++ object is going away there is no way to force the Python object
 // (and all references to it) to die too.  This causes problems (crashes) in
 // This is called when an OOR controled object is being destroyed.  Although
 // the C++ object is going away there is no way to force the Python object
 // (and all references to it) to die too.  This causes problems (crashes) in


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

-    bool blocked = 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,


@@ -907,8 +927,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!?!?!"));


@@ -1044,6 +1065,8 @@ PyObject*  wxPyMake_wxSizer(wxSizer* source, bool setThisOwn) {
 
 
 #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();


@@ -1093,7 +1116,7 @@ void wxPySaveThreadState(PyThreadState* tstate) {
             // (i.e. ActiveX controls) will (incorrectly IMHO) use a transient
             // tstate which will then be garbage the next time we try to use
             // it...
             // (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;
         }


@@ -1104,6 +1127,7 @@ void wxPySaveThreadState(PyThreadState* tstate) {
 }
 
 #endif
 }
 
 #endif

+#endif

 
 
 
 
 
 


@@ -1113,7 +1137,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);

+#endif

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


@@ -1131,17 +1157,18 @@ 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:
 

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

     wxPyThreadState* tstate = wxPyGetThreadState();
     if (current != tstate->tstate) {
         PyEval_RestoreThread(tstate->tstate);
     wxPyThreadState* tstate = wxPyGetThreadState();
     if (current != tstate->tstate) {
         PyEval_RestoreThread(tstate->tstate);


@@ -1149,11 +1176,17 @@ bool wxPyBeginBlockThreads() {
     }
     return blocked;
 #endif
     }
     return blocked;
 #endif

+#else
+    return false;
+#endif

 }
 
 
 }
 
 

-void wxPyEndBlockThreads(bool blocked) {
+void wxPyEndBlockThreads(wxPyBlock_t blocked) {

 #ifdef WXP_WITH_THREAD
 #ifdef WXP_WITH_THREAD

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


@@ -1161,6 +1194,7 @@ void wxPyEndBlockThreads(bool blocked) {
         PyEval_SaveThread();
     }
 #endif
         PyEval_SaveThread();
     }
 #endif

+#endif

 }
 
 
 }
 
 


@@ -1198,7 +1232,7 @@ 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) {

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

         PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;
         PyErr_SetString(PyExc_IOError, "no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;


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

-    bool blocked = 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");


@@ -1239,7 +1273,7 @@ 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) {

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

         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;


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

-    bool blocked = 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");


@@ -1271,19 +1305,19 @@ 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) {

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

         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
     // init list
         PyErr_SetString(PyExc_IOError,"no valid C-wxInputStream");
         wxPyEndBlockThreads(blocked);
         return NULL;
     }
 
     // init list

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

     pylist = PyList_New(0);
     wxPyEndBlockThreads(blocked);
     pylist = PyList_New(0);
     wxPyEndBlockThreads(blocked);

-    
+

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

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

         PyErr_NoMemory();
         wxPyEndBlockThreads(blocked);
         return NULL;
         PyErr_NoMemory();
         wxPyEndBlockThreads(blocked);
         return NULL;


@@ -1294,12 +1328,12 @@ 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) {

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

             Py_DECREF(pylist);
             wxPyEndBlockThreads(blocked);
             return NULL;
         }
             Py_DECREF(pylist);
             wxPyEndBlockThreads(blocked);
             return NULL;
         }

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

         PyList_Append(pylist, s);
         i += PyString_Size(s);
         wxPyEndBlockThreads(blocked);
         PyList_Append(pylist, s);
         i += PyString_Size(s);
         wxPyEndBlockThreads(blocked);


@@ -1308,7 +1342,7 @@ PyObject* wxPyInputStream::readlines(int sizehint) {
     // 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) {

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

         Py_DECREF(pylist);
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
         wxPyEndBlockThreads(blocked);
         Py_DECREF(pylist);
         PyErr_SetString(PyExc_IOError,"IOError in wxInputStream");
         wxPyEndBlockThreads(blocked);


@@ -1337,9 +1371,20 @@ 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() {

-    bool blocked=false;
+    wxPyBlock_t blocked;

     if (m_block) blocked = wxPyBeginBlockThreads();
     Py_XDECREF(m_read);
     Py_XDECREF(m_seek);
     if (m_block) blocked = wxPyBeginBlockThreads();
     Py_XDECREF(m_read);
     Py_XDECREF(m_seek);


@@ -1349,7 +1394,7 @@ wxPyCBInputStream::~wxPyCBInputStream() {
 
 
 wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {
 
 
 wxPyCBInputStream* wxPyCBInputStream::create(PyObject *py, bool block) {

-    bool blocked=false;
+    wxPyBlock_t blocked;

     if (block) blocked = wxPyBeginBlockThreads();
 
     PyObject* read = getMethod(py, "read");
     if (block) blocked = wxPyBeginBlockThreads();
 
     PyObject* read = getMethod(py, "read");


@@ -1374,6 +1419,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;


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

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


@@ -1432,7 +1481,7 @@ size_t wxPyCBInputStream::OnSysWrite(const void *buffer, size_t bufsize) {
 
 
 wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
 
 
 wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {

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

     PyObject* arglist = PyTuple_New(2);
 
     if (sizeof(wxFileOffset) > sizeof(long))
     PyObject* arglist = PyTuple_New(2);
 
     if (sizeof(wxFileOffset) > sizeof(long))


@@ -1443,7 +1492,7 @@ wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
 
     PyTuple_SET_ITEM(arglist, 1, PyInt_FromLong(mode));
 
 
     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);


@@ -1453,7 +1502,7 @@ wxFileOffset wxPyCBInputStream::OnSysSeek(wxFileOffset off, wxSeekMode mode) {
 
 
 wxFileOffset wxPyCBInputStream::OnSysTell() const {
 
 
 wxFileOffset wxPyCBInputStream::OnSysTell() const {

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


@@ -1484,7 +1533,7 @@ wxPyCallback::wxPyCallback(const wxPyCallback& other) {
 }
 
 wxPyCallback::~wxPyCallback() {
 }
 
 wxPyCallback::~wxPyCallback() {

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

     Py_DECREF(m_func);
     wxPyEndBlockThreads(blocked);
 }
     Py_DECREF(m_func);
     wxPyEndBlockThreads(blocked);
 }


@@ -1502,7 +1551,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
     PyObject*       tuple;
     bool            checkSkip = false;
 
     PyObject*       tuple;
     bool            checkSkip = false;
 

-    bool blocked = 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


@@ -1529,7 +1578,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
             s_preName  = PyString_FromString(wxPy_PRECALLINIT);
             s_postName = PyString_FromString(wxPy_POSTCALLCLEANUP);
         }
             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);
         // Check if the event object needs some preinitialization
         if (PyObject_HasAttr(arg, s_preName)) {
             result = PyObject_CallMethodObjArgs(arg, s_preName, arg, NULL);


@@ -1538,9 +1587,9 @@ void wxPyCallback::EventThunker(wxEvent& event) {
                 PyErr_Clear();       // Just in case...
             } else {
                 PyErr_Print();
                 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


@@ -1560,7 +1609,7 @@ void wxPyCallback::EventThunker(wxEvent& event) {
                 PyErr_Clear();       // Just in case...
             } else {
                 PyErr_Print();
                 PyErr_Clear();       // Just in case...
             } else {
                 PyErr_Print();

-            }            
+            }

         }
 
         if ( checkSkip ) {
         }
 
         if ( checkSkip ) {


@@ -1762,7 +1811,7 @@ 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) {

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

         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);
         wxPyEndBlockThreads(blocked);
         Py_XDECREF(cbh->m_self);
         Py_XDECREF(cbh->m_class);
         wxPyEndBlockThreads(blocked);


@@ -1783,14 +1832,14 @@ wxPyEvtSelfRef::wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {
 }
 
 wxPyEvtSelfRef::~wxPyEvtSelfRef() {

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

     if (m_cloned)
         Py_DECREF(m_self);
     wxPyEndBlockThreads(blocked);
 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {
     if (m_cloned)
         Py_DECREF(m_self);
     wxPyEndBlockThreads(blocked);
 }
 
 void wxPyEvtSelfRef::SetSelf(PyObject* self, bool clone) {

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

     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;
     if (m_cloned)
         Py_DECREF(m_self);
     m_self = self;


@@ -1857,7 +1906,7 @@ PyObject* wxPy_ConvertList(wxListBase* listbase) {
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 
     wxObject*   wxObj;
     wxNode*     node = list->GetFirst();
 

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

     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();
     pyList = PyList_New(0);
     while (node) {
         wxObj = node->GetData();


@@ -1880,7 +1929,7 @@ long wxPyGetWinHandle(wxWindow* win) {
 #if defined(__WXGTK__) || defined(__WXX11)
     return (long)GetXWindow(win);
 #endif
 #if defined(__WXGTK__) || defined(__WXX11)
     return (long)GetXWindow(win);
 #endif

-    
+

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


@@ -1903,7 +1952,7 @@ wxString* wxString_in_helper(PyObject* source) {
 #if wxUSE_UNICODE
     PyObject* uni = source;
     if (PyString_Check(source)) {
 #if wxUSE_UNICODE
     PyObject* uni = source;
     if (PyString_Check(source)) {

-        uni = PyUnicode_FromObject(source);
+        uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");

         if (PyErr_Occurred()) return NULL;
     }
     target = new wxString();
         if (PyErr_Occurred()) return NULL;
     }
     target = new wxString();


@@ -1918,18 +1967,22 @@ wxString* wxString_in_helper(PyObject* source) {
 #else
     // Convert to a string object if it isn't already, then to wxString
     PyObject* str = source;
 #else
     // Convert to a string object if it isn't already, then to wxString
     PyObject* str = source;

-    if (!PyString_Check(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);
         str = PyObject_Str(source);
         if (PyErr_Occurred()) return NULL;
     }
     char* tmpPtr; int tmpSize;
     PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
     target = new wxString(tmpPtr, tmpSize);

-    
+

     if (!PyString_Check(source))
         Py_DECREF(str);
 #endif // wxUSE_UNICODE
     if (!PyString_Check(source))
         Py_DECREF(str);
 #endif // wxUSE_UNICODE

-    
+

     return target;
 }
 
     return target;
 }
 


@@ -1943,28 +1996,32 @@ wxString Py2wxString(PyObject* source)
     // Convert to a unicode object, if not already, then to a wxString
     PyObject* uni = source;
     if (!PyUnicode_Check(source)) {
     // Convert to a unicode object, if not already, then to a wxString
     PyObject* uni = source;
     if (!PyUnicode_Check(source)) {

-        uni = PyUnicode_FromObject(source);
+        uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");

         if (PyErr_Occurred()) return wxEmptyString;  // TODO:  should we PyErr_Clear?
         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();
     }
     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
     // Convert to a string object if it isn't already, then to wxString
     PyObject* str = source;
     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 (!PyString_Check(source)) {
+    if (PyUnicode_Check(source)) {
+        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?
     }
     char* tmpPtr; int tmpSize;
     PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
     target = wxString(tmpPtr, tmpSize);
         str = PyObject_Str(source);
         if (PyErr_Occurred()) return wxEmptyString;    // TODO:  should we PyErr_Clear?
     }
     char* tmpPtr; int tmpSize;
     PyString_AsStringAndSize(str, &tmpPtr, &tmpSize);
     target = wxString(tmpPtr, tmpSize);

-    
+

     if (!PyString_Check(source))
         Py_DECREF(str);
 #endif // wxUSE_UNICODE
     if (!PyString_Check(source))
         Py_DECREF(str);
 #endif // wxUSE_UNICODE


@@ -1986,6 +2043,17 @@ PyObject* wx2PyString(const wxString& src)
 }
 
 
 }
 
 

+
+void wxSetDefaultPyEncoding(const char* encoding)
+{
+    strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE);
+}
+
+const char* wxGetDefaultPyEncoding()
+{
+    return wxPyDefaultEncoding;
+}
+

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