just added a comment

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

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index b6a170c8ee6b5ac400b66cee34e074c8ccc8d8be..8d22be40fd28ca6b104f28235571a521da4d44c5 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -7,6 +7,8 @@
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

+#include "wx/wxprec.h"
+

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


@@ -26,38 +28,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);


@@ -66,7 +40,7 @@ void wxMacCreateNotifierTable()
     for ( int i = 0 ; i < kMaxEvents ; ++i )
     {
         gMacNotificationEvents.proc[i] = NULL ;
     for ( int i = 0 ; i < kMaxEvents ; ++i )
     {
         gMacNotificationEvents.proc[i] = NULL ;

-        gMacNotificationEvents.events[i] = NULL ;
+        gMacNotificationEvents.events[i] = 0 ;

         gMacNotificationEvents.data[i] = NULL ;
     }
 }
         gMacNotificationEvents.data[i] = NULL ;
     }
 }


@@ -88,7 +62,7 @@ void wxMacAddEvent(
     short wakeUp ) 
 {
     wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;
     short wakeUp ) 
 {
     wxMacNotificationEvents *e = (wxMacNotificationEvents *) table ;

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

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


@@ -112,11 +86,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 ;

     }
 }
 
     }
 }
 


@@ -145,7 +119,7 @@ void wxMacProcessNotifierEvents()
             wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
             
             gMacNotificationEvents.data[index] = NULL ;
             wxMacNotificationProcPtr handler =  gMacNotificationEvents.proc[index] ;
             
             gMacNotificationEvents.data[index] = NULL ;

-            gMacNotificationEvents.events[index] = NULL ;
+            gMacNotificationEvents.events[index] = 0 ;

             gMacNotificationEvents.proc[index]  = NULL ;
             
             if ( handler )
             gMacNotificationEvents.proc[index]  = NULL ;
             
             if ( handler )