corrected GetDepth method and wrong disposal calls for pixmap

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

diff --git a/src/mac/macnotfy.cpp b/src/mac/macnotfy.cpp
index a47fce31e54a2b34bd64915c161b5e0aba822670..9d0a2a834674c5ecb499d02139d42504687b1774 100644 (file)
--- a/src/mac/macnotfy.cpp
+++ b/src/mac/macnotfy.cpp
@@ -8,6 +8,9 @@
  */
 
 #include "wx/wx.h"
  */
 
 #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 ;


@@ -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 ;
 }