LocalToGlobal/GlobalToLocal Conversions with Carbon API, cleanup, hittesting correcte...

[wxWidgets.git] / src / mac / carbon / thread.cpp

diff --git a/src/mac/carbon/thread.cpp b/src/mac/carbon/thread.cpp
index ad7f278ff9dccd641ee776bc28a49f47e922929b..84de36ee2bf07b530835346284266f549bfda4ae 100644 (file)
--- a/src/mac/carbon/thread.cpp
+++ b/src/mac/carbon/thread.cpp
@@ -7,7 +7,7 @@
 // RCS-ID:     $Id$
 // Copyright:  (c) Wolfram Gloger (1996, 1997); Guilhem Lavaux (1998),
 //                 Vadim Zeitlin (1999) , Stefan Csomor (2000)
-// Licence:    wxWidgets licence
+// Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -1630,6 +1630,11 @@ void wxThreadModule::OnExit()
 {
     if ( gs_critsectGui )
     {
+        if ( !wxGuiOwnedByMainThread() )
+        {
+            gs_critsectGui->Enter();
+            gs_bGuiOwnedByMainThread = true;
+        }
         gs_critsectGui->Leave();
         delete gs_critsectGui;
         gs_critsectGui = NULL;