generate key events for Space/Enter in addition to the activate events, as wxMSW...

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

diff --git a/src/mac/macnotfy.cpp b/src/mac/macnotfy.cpp
index db406cdc63b36ea0ba970a4ac98caf606a00af49..507605510db7d7c126d65b0a07ea3f64a8b47969 100644 (file)
--- a/src/mac/macnotfy.cpp
+++ b/src/mac/macnotfy.cpp
@@ -8,6 +8,9 @@
  */
 
 #include "wx/wx.h"
  */
 
 #include "wx/wx.h"

+
+#include "wx/mac/private.h"
+

 #include "wx/mac/macnotfy.h"
 
 const short kMaxEvents = 1000 ;
 #include "wx/mac/macnotfy.h"
 
 const short kMaxEvents = 1000 ;


@@ -59,7 +62,6 @@ void wxMacCreateNotifierTable()
 
 void wxMacDestroyNotifierTable() 
 {
 
 void wxMacDestroyNotifierTable() 
 {

-       wxASSERT( gMacNotificationEvents.top == gMacNotificationEvents.bottom ) ;

 }
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 
 }
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 


@@ -75,6 +77,7 @@ void wxMacAddEvent(
        short wakeUp ) 
 {
        wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
        short wakeUp ) 
 {
        wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;

+       wxASSERT_MSG( handler != NULL , "illegal notification proc ptr" ) ;

        /* this should be protected eventually */
        short index = e->top++ ;
        
        /* this should be protected eventually */
        short index = e->top++ ;
        


@@ -112,21 +115,31 @@ void wxMacProcessNotifierEvents()
 //     return ;
        
   gInProcessing = true ;
 //     return ;
        
   gInProcessing = true ;

-  while ( gMacNotificationEvents.top != gMacNotificationEvents.bottom )
+  if ( 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 ;
-    
-       handler( event , data  ) ;
+    // 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 ;
 }
   }
   gInProcessing = false ;
 }