A fix for when wxPython is compiled with no threads

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/gtk/misc2.cpp b/wxPython/src/gtk/misc2.cpp
index 6e5a51c59ef30fdfc5a31d6e39b35c76b773a497..051cb332bf820b07a570fff18d22512790c8ba52 100644 (file)
--- a/wxPython/src/gtk/misc2.cpp
+++ b/wxPython/src/gtk/misc2.cpp
@@ -145,7 +145,11 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 
     bool wxThread_IsMain() {
 
 
     bool wxThread_IsMain() {

+#ifdef WXP_WITH_THREAD

         return wxThread::IsMain();
         return wxThread::IsMain();

+#else
+        return TRUE;
+#endif

     }
 
 class wxPyTipProvider : public wxTipProvider {
     }
 
 class wxPyTipProvider : public wxTipProvider {

diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i
index 9b4909698304e04db42b3d9f5bcd9e7d7f0c5108..9da8e9f5303ed4fb7746b23c62d7fc8353bf0335 100644 (file)
--- a/wxPython/src/misc2.i
+++ b/wxPython/src/misc2.i
@@ -410,7 +410,11 @@ public:
 
 %inline %{
     bool wxThread_IsMain() {
 
 %inline %{
     bool wxThread_IsMain() {

+#ifdef WXP_WITH_THREAD

         return wxThread::IsMain();
         return wxThread::IsMain();

+#else
+        return TRUE;
+#endif

     }
 %}
 
     }
 %}
 

diff --git a/wxPython/src/msw/misc2.cpp b/wxPython/src/msw/misc2.cpp
index f94997408242c58582589d5fce682de7223190c5..0d19b32cbe2026f705fd92369b7034c0c606a1da 100644 (file)
--- a/wxPython/src/msw/misc2.cpp
+++ b/wxPython/src/msw/misc2.cpp
@@ -145,7 +145,11 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 
     bool wxThread_IsMain() {
 
 
     bool wxThread_IsMain() {

+#ifdef WXP_WITH_THREAD

         return wxThread::IsMain();
         return wxThread::IsMain();

+#else
+        return TRUE;
+#endif

     }
 
 class wxPyTipProvider : public wxTipProvider {
     }
 
 class wxPyTipProvider : public wxTipProvider {