Rework wxMotif font/color inheritance so it works

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

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index bc0330d2f805b6a0190f7c6d77e875083438297b..326e764eaaa8907a23c1ecffeeeffb409760c593 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -19,13 +19,11 @@
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/toplevel.h"
     #include "wx/dcmemory.h"
     #include "wx/menu.h"
     #include "wx/toplevel.h"

+    #include "wx/icon.h"

 #endif
 
 #include "wx/mac/private.h"
 
 #endif
 
 #include "wx/mac/private.h"
 

-#include "wx/icon.h"
-
-

 class wxTaskBarIconImpl
 {
 public:
 class wxTaskBarIconImpl
 {
 public:


@@ -188,7 +186,7 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
                 wxMenuItem *item = NULL;
 
                 if (id != 0) // get the wxMenuItem reference from the MenuRef
                 wxMenuItem *item = NULL;
 
                 if (id != 0) // get the wxMenuItem reference from the MenuRef

-                    GetMenuItemRefCon( menuRef, menuItemIndex, (UInt32*) &item );
+                    GetMenuItemRefCon( menuRef, menuItemIndex, (URefCon*) &item );

 
                 if (item)
                 {
 
                 if (item)
                 {


@@ -237,7 +235,7 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
         // When SetEventParameter is called it will decrement
         // the reference count of the menu - we need to make
         // sure it stays around in the wxMenu class here
         // When SetEventParameter is called it will decrement
         // the reference count of the menu - we need to make
         // sure it stays around in the wxMenu class here

-        RetainMenu(hMenu);
+        CFRetain(hMenu);

 
         // set the actual dock menu
         err = SetEventParameter(
 
         // set the actual dock menu
         err = SetEventParameter(