Removed all duplicated and complicated #ifdefs for enabling Skip and Abort in progres...

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

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index 36d7fb3e614bfa2c7c8d62471120b8ae31476e8d..2962de20f55f1297ff97c7c32d7de37b674f78c8 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -26,38 +26,10 @@ struct wxMacNotificationEvents
 } ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;
 } ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;

-wxMacNotificationEvents gMacNotificationEvents ;
+static wxMacNotificationEvents gMacNotificationEvents ;

 
 ProcessSerialNumber gAppProcess ;
 
 
 ProcessSerialNumber gAppProcess ;
 

-void wxMacWakeUp()
-{
-    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()
 {
       GetCurrentProcess(&gAppProcess);
 void wxMacCreateNotifierTable()
 {
       GetCurrentProcess(&gAppProcess);


@@ -112,11 +84,11 @@ void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data )
     
     while ( e->top != index )
     {
     
     while ( e->top != index )
     {

-        if ( index == kMaxEvents )
-            index = 0 ;

         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;
         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;

+        if ( index == kMaxEvents )
+            index = 0 ;

     }
 }
 
     }
 }