applied SourceForge patch # 854330 for Filedialog Unicode fixes

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

diff --git a/src/mac/macnotfy.cpp b/src/mac/macnotfy.cpp
index b6a170c8ee6b5ac400b66cee34e074c8ccc8d8be..690f83b214d3199dc69c3a01961261251d0bd7ca 100644 (file)
--- a/src/mac/macnotfy.cpp
+++ b/src/mac/macnotfy.cpp
@@ -26,9 +26,9 @@ struct wxMacNotificationEvents
 } ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;
-wxMacNotificationEvents gMacNotificationEvents ;
+static wxMacNotificationEvents gMacNotificationEvents ;
 
-ProcessSerialNumber gAppProcess ;
+static ProcessSerialNumber gAppProcess ;
 
 void wxMacWakeUp()
 {
@@ -88,7 +88,7 @@ void wxMacAddEvent(
     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++ ;
     
@@ -112,11 +112,11 @@ void wxMacRemoveAllNotifiersForData( wxMacNotifierTableRef table , void* data )
     
     while ( e->top != index )
     {
-        if ( index == kMaxEvents )
-            index = 0 ;
         if ( e->data[index] == data )
             e->data[index] = NULL ;
         index++ ;
+        if ( index == kMaxEvents )
+            index = 0 ;
     }
 }