X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51c4d2a5a05cc996e3e9085e0d95b7a555ba163b..af86380553169606c985e0053a1630e9514e18b6:/src/mac/carbon/taskbar.cpp diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp index 5fea2b7552..bce496ab28 100644 --- a/src/mac/carbon/taskbar.cpp +++ b/src/mac/carbon/taskbar.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: src/mac/carbon/taskbar.cpp -// Purpose: wxTaskBarIcon +// Purpose: wxTaskBarIcon // Author: Ryan Norton // Modified by: // Created: 09/25/2004 @@ -13,13 +13,16 @@ #ifdef wxHAS_TASK_BAR_ICON -#include "wx/mac/private.h" - #include "wx/taskbar.h" -#include "wx/menu.h" -#include "wx/icon.h" -#include "wx/dcmemory.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" class wxTaskBarIconImpl { @@ -54,7 +57,7 @@ class wxTaskBarIconWindow : public wxTopLevelWindow { public: wxTaskBarIconWindow(wxTaskBarIconImpl *impl) - : wxTopLevelWindow(NULL, -1, wxT("")), m_impl(impl) + : wxTopLevelWindow(NULL, wxID_ANY, wxEmptyString), m_impl(impl) { Connect( -1, wxEVT_COMMAND_MENU_SELECTED, @@ -232,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(