memory leak fixed

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

diff --git a/src/mac/carbon/macnotfy.cpp b/src/mac/carbon/macnotfy.cpp
index 3546eeb7f27defcb123bec949b6bdb68c06521b1..9d0a2a834674c5ecb499d02139d42504687b1774 100644 (file)
--- a/src/mac/carbon/macnotfy.cpp
+++ b/src/mac/carbon/macnotfy.cpp
@@ -7,6 +7,10 @@
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

+#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 ;


@@ -24,7 +28,7 @@ struct wxMacNotificationEvents
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;
 wxMacNotificationEvents gMacNotificationEvents ;
 
 typedef struct wxMacNotificationEvents wxMacNotificationEvents ;
 wxMacNotificationEvents gMacNotificationEvents ;
 

-ProcessSerialNumber gSocketProcess ;
+ProcessSerialNumber gAppProcess ;

 
 void wxMacWakeUp()
 {
 
 void wxMacWakeUp()
 {


@@ -32,20 +36,20 @@ void wxMacWakeUp()
        Boolean isSame ;
        psn.highLongOfPSN = 0 ;
        psn.lowLongOfPSN = kCurrentProcess ;
        Boolean isSame ;
        psn.highLongOfPSN = 0 ;
        psn.lowLongOfPSN = kCurrentProcess ;

-       SameProcess( &gSocketProcess , &psn , &isSame ) ;
+       SameProcess( &gAppProcess , &psn , &isSame ) ;

        if ( isSame )
        {
                PostEvent( nullEvent , 0 ) ;
        }
        else
        {
        if ( isSame )
        {
                PostEvent( nullEvent , 0 ) ;
        }
        else
        {

-               WakeUpProcess( &gSocketProcess ) ;
+               WakeUpProcess( &gAppProcess ) ;

        }
 }
 
 void wxMacCreateNotifierTable()
 {
        }
 }
 
 void wxMacCreateNotifierTable()
 {

-       GetCurrentProcess(&gSocketProcess);
+       GetCurrentProcess(&gAppProcess);

        gMacNotificationEvents.top = 0 ;
        gMacNotificationEvents.bottom = 0 ;
        for ( int i = 0 ; i < kMaxEvents ; ++i )
        gMacNotificationEvents.top = 0 ;
        gMacNotificationEvents.bottom = 0 ;
        for ( int i = 0 ; i < kMaxEvents ; ++i )


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

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

 }
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 
 }
 
 wxMacNotifierTableRef wxMacGetNotifierTable() 


@@ -74,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++ ;
        


@@ -125,7 +129,8 @@ void wxMacProcessNotifierEvents()
        gMacNotificationEvents.events[index] = NULL ;
        gMacNotificationEvents.proc[index]  = NULL ;
     
        gMacNotificationEvents.events[index] = NULL ;
        gMacNotificationEvents.proc[index]  = NULL ;
     

-       handler( event , data  ) ;
+    if ( handler )
+           handler( event , data  ) ;

   }
   gInProcessing = false ;
 }
   }
   gInProcessing = false ;
 }