From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Mon, 28 Feb 2011 09:26:55 +0000 (+0000)
Subject: osx_cocoa supports both kind of taskbaricons in the menubar (standard) and as functio... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/a96f3e138b338ebb59c247a1ba779014d958f834?ds=inline

osx_cocoa supports both kind of taskbaricons in the menubar (standard) and as function of the dock (type DOCK)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/taskbar/tbtest.cpp b/samples/taskbar/tbtest.cpp
index a9abff2cb1..f63a1843fb 100644
--- a/samples/taskbar/tbtest.cpp
+++ b/samples/taskbar/tbtest.cpp
@@ -125,9 +125,6 @@ MyDialog::MyDialog(const wxString& title)
     Centre();
 
     m_taskBarIcon = new MyTaskBarIcon();
-#if defined(__WXCOCOA__)
-    m_dockIcon = new MyTaskBarIcon(wxTaskBarIcon::DOCK);
-#endif
 
     // we should be able to show up to 128 characters on recent Windows versions
     // (and 64 on Win9x)
@@ -139,6 +136,14 @@ MyDialog::MyDialog(const wxString& title)
     {
         wxLogError(wxT("Could not set icon."));
     }
+
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+    m_dockIcon = new MyTaskBarIcon(wxTaskBarIcon::DOCK);
+    if ( !m_dockIcon->SetIcon(wxICON(sample)) )
+    {
+        wxLogError(wxT("Could not set icon."));
+    }
+#endif
 }
 
 MyDialog::~MyDialog()
@@ -258,7 +263,7 @@ wxMenu *MyTaskBarIcon::CreatePopupMenu()
     submenu->AppendSeparator();
     submenu->Append(PU_SUB2, wxT("Another submenu"));
     menu->Append(PU_SUBMAIN, wxT("Submenu"), submenu);
-#ifndef __WXMAC_OSX__ /*Mac has built-in quit menu*/
+#ifndef __WXOSX__ /*Mac has built-in quit menu*/
     menu->AppendSeparator();
     menu->Append(PU_EXIT,    wxT("E&xit"));
 #endif
diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index df54f38dcf..6c08b2ef87 100644
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -12,7 +12,7 @@
 class MyTaskBarIcon : public wxTaskBarIcon
 {
 public:
-#if defined(__WXCOCOA__)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
     MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
     :   wxTaskBarIcon(iconType)
 #else
@@ -53,7 +53,7 @@ protected:
     void OnCloseWindow(wxCloseEvent& event);
 
     MyTaskBarIcon   *m_taskBarIcon;
-#if defined(__WXCOCOA__)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
     MyTaskBarIcon   *m_dockIcon;
 #endif