crashes fixed, trying to remove erradic redraws when layouting windows

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

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index b6a170c8ee6b5ac400b66cee34e074c8ccc8d8be..65e43775982084403b50b5f54d485ffd425345e7 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -88,7 +88,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 +112,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 ;

     }
 }
 
     }
 }