SWIGged updates for wxMac

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

diff --git a/wxPython/contrib/stc/mac/stc_.py b/wxPython/contrib/stc/mac/stc_.py
index 43305a876e24b8a0c8b7f74503fee6f5065bbf23..daf9abc542af139463b9c54b03fc1458a6ced01b 100644 (file)
--- a/wxPython/contrib/stc/mac/stc_.py
+++ b/wxPython/contrib/stc/mac/stc_.py
@@ -15,6 +15,8 @@ from events import *
 
 from streams import *
 
 
 from streams import *
 

+from utils import *
+

 from mdi import *
 
 from frames import *
 from mdi import *
 
 from frames import *


@@ -39,8 +41,6 @@ from sizers import *
 
 from filesys import *
 
 
 from filesys import *
 

-from utils import *
-

 def EVT_STC_CHANGE(win, id, func):
     win.Connect(id, -1, wxEVT_STC_CHANGE, func)
 
 def EVT_STC_CHANGE(win, id, func):
     win.Connect(id, -1, wxEVT_STC_CHANGE, func)
 

diff --git a/wxPython/src/mac/misc2.cpp b/wxPython/src/mac/misc2.cpp
index 4dc78796472b2944033f8bfa27bbf4bde8a68b4b..e6cfe72f8307da1667a2159ad7a95c9302f9609c 100644 (file)
--- a/wxPython/src/mac/misc2.cpp
+++ b/wxPython/src/mac/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 {