From a40e9852ea159602b63f9d0af16a039862703c14 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sun, 10 Mar 2019 20:51:14 +0000
Subject: [PATCH] Revert "TaskBarIcon doesn't seem to work on OS X any more,
 either."

This reverts commit 07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579.
---
 src/tools/dcpomatic_server.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 9c4832138..dc640ff03 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -210,7 +210,13 @@ public:
 	TaskBarIcon ()
 		: _status (0)
 	{
+#ifdef DCPOMATIC_WINDOWS
 		wxIcon icon (std_to_wx ("id"));
+#else
+		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+		wxIcon icon;
+		icon.CopyFromBitmap (bitmap);
+#endif
 
 		SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
@@ -286,7 +292,7 @@ private:
 		*/
 		Config::instance();
 
-#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+#ifdef DCPOMATIC_LINUX
 		StatusDialog* d = new StatusDialog ();
 		d->Show ();
 #else
-- 
2.30.2