corrected wake up code

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

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index b197837cf115bc951f2f2dfd09e7654fea925da1..b3756d3fa3b2b575748b674992c03904cd44a08a 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -735,8 +735,10 @@ void wxMacWakeUp()
     if ( isSame )
     {
 #if TARGET_CARBON
     if ( isSame )
     {
 #if TARGET_CARBON

-        static wxMacCarbonEvent s_wakeupEvent ;

         OSStatus err = noErr ;
         OSStatus err = noErr ;

+#if 0
+        // lead sometimes to race conditions, although all calls used should be thread safe ...
+        static wxMacCarbonEvent s_wakeupEvent ;

         if ( !s_wakeupEvent.IsValid() )
         {
            err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
         if ( !s_wakeupEvent.IsValid() )
         {
            err = s_wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),


@@ -744,12 +746,20 @@ void wxMacWakeUp()
         }
         if ( err == noErr )
         {
         }
         if ( err == noErr )
         {

+            

             if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
                 return ;
             s_wakeupEvent.SetCurrentTime() ;
             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
             if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
                 return ;
             s_wakeupEvent.SetCurrentTime() ;
             err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,

-                                  kEventPriorityHigh);
+                                  kEventPriorityHigh );

         }
         }

+#else
+        wxMacCarbonEvent wakeupEvent ;
+        wakeupEvent.Create( 'WXMC', 'WXMC', GetCurrentEventTime(),
+                            kEventAttributeNone ) ;
+        err = PostEventToQueue(GetMainEventQueue(), wakeupEvent,
+                               kEventPriorityHigh );
+#endif

 #else
         PostEvent( nullEvent , 0 ) ;
 #endif
 #else
         PostEvent( nullEvent , 0 ) ;
 #endif