porting dcscreen blit from 2.8

[wxWidgets.git] / src / osx / carbon / taskbar.cpp

diff --git a/src/osx/carbon/taskbar.cpp b/src/osx/carbon/taskbar.cpp
index 9bb02f5124e0c73dcf2e9e8bea5b6770ec381d98..ffca169573c1bc4c709154a0c2b1e8b3ca116f2e 100644 (file)
--- a/src/osx/carbon/taskbar.cpp
+++ b/src/osx/carbon/taskbar.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/taskbar.cpp
+// Name:        src/osx/carbon/taskbar.cpp

 // Purpose:     wxTaskBarIcon
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     wxTaskBarIcon
 // Author:      Ryan Norton
 // Modified by:


@@ -22,7 +22,7 @@
     #include "wx/icon.h"
 #endif
 
     #include "wx/icon.h"
 #endif
 

-#include "wx/mac/private.h"
+#include "wx/osx/private.h"

 
 class wxTaskBarIconImpl
 {
 
 class wxTaskBarIconImpl
 {


@@ -186,9 +186,15 @@ wxDockEventHandler(EventHandlerCallRef WXUNUSED(inHandlerCallRef),
                     if (item && itemMenu )
                     {
                         if ( eventKind == kEventCommandProcess )
                     if (item && itemMenu )
                     {
                         if ( eventKind == kEventCommandProcess )

-                            err = itemMenu->MacHandleCommandProcess( item, id );
+                        {
+                            if ( itemMenu->HandleCommandProcess( item ) )
+                                err = noErr;
+                        }

                         else if ( eventKind == kEventCommandUpdateStatus )
                         else if ( eventKind == kEventCommandUpdateStatus )

-                            err = itemMenu->MacHandleCommandUpdateStatus( item, id );
+                        {
+                            if ( itemMenu->HandleCommandUpdateStatus( item ) )
+                                err = noErr;
+                        }

                     }
                 }
             }
                     }
                 }
             }