X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f38924e863cd44e2abd49d20d201d72aa773c51e..24904055f37af7cd12d1241469bc4852502ad302:/src/mac/carbon/taskbar.cpp

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index cc9afbef1d..e263984d0a 100644
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -11,20 +11,19 @@
 
 #include "wx/wxprec.h"
 
-#ifdef wxHAS_TASK_BAR_ICON
+#if wxUSE_TASKBARICON
 
 #include "wx/taskbar.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dcmemory.h"
+    #include "wx/menu.h"
+    #include "wx/toplevel.h"
+    #include "wx/icon.h"
 #endif
 
 #include "wx/mac/private.h"
 
-#include "wx/menu.h"
-#include "wx/icon.h"
-
-
 class wxTaskBarIconImpl
 {
 public:
@@ -187,7 +186,7 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
                 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)
                 {
@@ -236,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
-        RetainMenu(hMenu);
+        CFRetain(hMenu);
 
         // set the actual dock menu
         err = SetEventParameter(
@@ -291,7 +290,7 @@ wxMenu * wxDeepCopyMenu( wxMenu *menu )
             new wxMenuItem(
                 m_pMenu, // parent menu
                 theItem->GetId(), // id
-                theItem->GetText(), // text label
+                theItem->GetItemLabel(), // text label
                 theItem->GetHelp(), // status bar help string
                 theItem->GetKind(), // menu flags - checkable, separator, etc.
                 wxDeepCopyMenu(theItem->GetSubMenu()) )); // submenu
@@ -522,4 +521,4 @@ bool wxTaskBarIcon::RemoveIcon()
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 { return m_impl->PopupMenu(menu); }
 
-#endif // wxHAS_TASK_BAR_ICON
+#endif // wxUSE_TASKBARICON