revert last change (r48897)

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

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index bce496ab28ca0531a4869b5b7d3ec7432cf0af49..e263984d0aeb81824d30a3b0d006fce39322a2e8 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -11,7 +11,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#ifdef wxHAS_TASK_BAR_ICON
+#if wxUSE_TASKBARICON

 
 #include "wx/taskbar.h"
 
 
 #include "wx/taskbar.h"
 


@@ -186,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)
                 {


@@ -290,7 +290,7 @@ wxMenu * wxDeepCopyMenu( wxMenu *menu )
             new wxMenuItem(
                 m_pMenu, // parent menu
                 theItem->GetId(), // id
             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
                 theItem->GetHelp(), // status bar help string
                 theItem->GetKind(), // menu flags - checkable, separator, etc.
                 wxDeepCopyMenu(theItem->GetSubMenu()) )); // submenu


@@ -521,4 +521,4 @@ bool wxTaskBarIcon::RemoveIcon()
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 { return m_impl->PopupMenu(menu); }
 
 bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 { return m_impl->PopupMenu(menu); }
 

-#endif // wxHAS_TASK_BAR_ICON
+#endif // wxUSE_TASKBARICON