merged the confllict resolution (I've fixed the m_format bug independently); no real...

[wxWidgets.git] / src / mac / macnotfy.cpp

diff --git a/src/mac/macnotfy.cpp b/src/mac/macnotfy.cpp
index 9d0a2a834674c5ecb499d02139d42504687b1774..65e43775982084403b50b5f54d485ffd425345e7 100644 (file)
--- a/src/mac/macnotfy.cpp
+++ b/src/mac/macnotfy.cpp
@@ -17,12 +17,12 @@ const short kMaxEvents = 1000 ;
 
 struct wxMacNotificationEvents
 {
 
 struct wxMacNotificationEvents
 {

-       short top ;
-       short bottom ;
-       
-       wxMacNotificationProcPtr proc[kMaxEvents] ;
-       unsigned long events[kMaxEvents] ;
-       void* data[kMaxEvents] ;
+    short top ;
+    short bottom ;
+    
+    wxMacNotificationProcPtr proc[kMaxEvents] ;
+    unsigned long events[kMaxEvents] ;
+    void* data[kMaxEvents] ;

 } ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;
 } ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;


@@ -32,32 +32,43 @@ ProcessSerialNumber gAppProcess ;
 
 void wxMacWakeUp()
 {
 
 void wxMacWakeUp()
 {

-       ProcessSerialNumber psn ;
-       Boolean isSame ;
-       psn.highLongOfPSN = 0 ;
-       psn.lowLongOfPSN = kCurrentProcess ;
-       SameProcess( &gAppProcess , &psn , &isSame ) ;
-       if ( isSame )
-       {
-               PostEvent( nullEvent , 0 ) ;
-       }
-       else
-       {
-               WakeUpProcess( &gAppProcess ) ;
-       }
+    ProcessSerialNumber psn ;
+    Boolean isSame ;
+    psn.highLongOfPSN = 0 ;
+    psn.lowLongOfPSN = kCurrentProcess ;
+    SameProcess( &gAppProcess , &psn , &isSame ) ;
+    if ( isSame )
+    {
+#if TARGET_CARBON
+        EventRef dummyEvent ;
+        OSStatus err = MacCreateEvent(nil, 'WXMC', 'WXMC', GetCurrentEventTime(),
+                        kEventAttributeNone, &dummyEvent);
+        if (err == noErr) 
+        {
+            err = PostEventToQueue(GetMainEventQueue(), dummyEvent,
+                                  kEventPriorityHigh);
+        } 
+#else
+        PostEvent( nullEvent , 0 ) ;
+#endif
+    }
+    else
+    {
+        WakeUpProcess( &gAppProcess ) ;
+    }

 }
 
 void wxMacCreateNotifierTable()
 {
 }
 
 void wxMacCreateNotifierTable()
 {

-       GetCurrentProcess(&gAppProcess);
-       gMacNotificationEvents.top = 0 ;
-       gMacNotificationEvents.bottom = 0 ;
-       for ( int i = 0 ; i < kMaxEvents ; ++i )
-       {
-               gMacNotificationEvents.proc[i] = NULL ;
-               gMacNotificationEvents.events[i] = NULL ;
-               gMacNotificationEvents.data[i] = NULL ;
-       }
+      GetCurrentProcess(&gAppProcess);
+    gMacNotificationEvents.top = 0 ;
+    gMacNotificationEvents.bottom = 0 ;
+    for ( int i = 0 ; i < kMaxEvents ; ++i )
+    {
+        gMacNotificationEvents.proc[i] = NULL ;
+        gMacNotificationEvents.events[i] = NULL ;
+        gMacNotificationEvents.data[i] = NULL ;
+    }

 }
 
 void wxMacDestroyNotifierTable() 
 }
 
 void wxMacDestroyNotifierTable() 


@@ -66,77 +77,86 @@ void wxMacDestroyNotifierTable()
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 
 {
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 
 {

-       return (wxMacNotifierTableRef) &gMacNotificationEvents ;
+    return (wxMacNotifierTableRef) &gMacNotificationEvents ;

 }
 
 void wxMacAddEvent( 
 }
 
 void wxMacAddEvent( 

-       wxMacNotifierTableRef table , 
-       wxMacNotificationProcPtr handler , 
-       unsigned long event , 
-       void* data , 
-       short wakeUp ) 
+    wxMacNotifierTableRef table , 
+    wxMacNotificationProcPtr handler , 
+    unsigned long event , 
+    void* data , 
+    short wakeUp ) 

 {
 {

-       wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
-       wxASSERT_MSG( handler != NULL , "illegal notification proc ptr" ) ;
-       /* this should be protected eventually */
-       short index = e->top++ ;
-       
-       if ( e->top == kMaxEvents )
-               e->top = 0 ;
-
-       e->proc[index] = handler ;
-       e->events[index] = event ;
-       e->data[index] = data ;
-       if ( wakeUp )
-               wxMacWakeUp() ;
+    wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
+    wxASSERT_MSG( handler != NULL , wxT("illegal notification proc ptr") ) ;
+    /* this should be protected eventually */
+    short index = e->top++ ;
+    
+    if ( e->top == kMaxEvents )
+        e->top = 0 ;
+
+    e->proc[index] = handler ;
+    e->events[index] = event ;
+    e->data[index] = data ;
+    if ( wakeUp )
+        wxMacWakeUp() ;

 }
 
 bool gInProcessing = false ;
 
 void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) 
 {
 }
 
 bool gInProcessing = false ;
 
 void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data ) 
 {

-       wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
-       /* this should be protected eventually */
-       short index = e->bottom ;
-       
-  while ( e->top != index )
-  {
-    if ( index == kMaxEvents )
-      index = 0 ;
-    if ( e->data[index] == data )
-       e->data[index] = NULL ;
-       index++ ;
-  }
+    wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
+    /* this should be protected eventually */
+    short index = e->bottom ;
+    
+    while ( e->top != index )
+    {
+        if ( e->data[index] == data )
+            e->data[index] = NULL ;
+        index++ ;
+        if ( index == kMaxEvents )
+            index = 0 ;
+    }

 }
 
 void wxMacProcessNotifierEvents()
 {
 }
 
 void wxMacProcessNotifierEvents()
 {

-//  if ( gInProcessing )
-//     return ;
-       
-  gInProcessing = true ;
-  while ( gMacNotificationEvents.top != gMacNotificationEvents.bottom )
-  {
-    // consume event at bottom
-       short index = gMacNotificationEvents.bottom++ ;
-    if ( gMacNotificationEvents.bottom == kMaxEvents )
-      gMacNotificationEvents.bottom = 0 ;
-    void* data = gMacNotificationEvents.data[index] ;
-    unsigned long event = gMacNotificationEvents.events[index] ;
-       wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
-       
-       gMacNotificationEvents.data[index] = NULL ;
-       gMacNotificationEvents.events[index] = NULL ;
-       gMacNotificationEvents.proc[index]  = NULL ;
+    //  if ( gInProcessing )
+    //      return ;

     
     

-    if ( handler )
-           handler( event , data  ) ;
-  }
-  gInProcessing = false ;
+    gInProcessing = true ;
+    if ( gMacNotificationEvents.top != gMacNotificationEvents.bottom )
+    {
+        // we only should process the notifiers that were here when we entered it
+        // otherwise we might never get out...  
+        short count = gMacNotificationEvents.top - gMacNotificationEvents.bottom ;
+        if ( count < 0 )
+            count += kMaxEvents ;
+        
+        while ( count-- )
+        {
+            // consume event at bottom
+            short index = gMacNotificationEvents.bottom++ ;
+            if ( gMacNotificationEvents.bottom == kMaxEvents )
+                gMacNotificationEvents.bottom = 0 ;
+            void* data = gMacNotificationEvents.data[index] ;
+            unsigned long event = gMacNotificationEvents.events[index] ;
+            wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
+            
+            gMacNotificationEvents.data[index] = NULL ;
+            gMacNotificationEvents.events[index] = NULL ;
+            gMacNotificationEvents.proc[index]  = NULL ;
+            
+            if ( handler )
+                handler( event , data  ) ;
+        }
+    }
+    gInProcessing = false ;

 }
 
 void wxMacProcessNotifierAndPendingEvents() 
 {
 }
 
 void wxMacProcessNotifierAndPendingEvents() 
 {

-       wxMacProcessNotifierEvents() ;
-       wxTheApp->ProcessPendingEvents() ;
+    wxMacProcessNotifierEvents() ;
+    wxTheApp->ProcessPendingEvents() ;

 }
 }