summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-02-18 00:13:11 +0000
committerCarl Hetherington <cth@carlh.net>2019-02-18 00:13:11 +0000
commit07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579 (patch)
tree421c683185e4531a4229f97aadeef2517c012a8f /src/tools
parenta5be11a965c2c38442e4e069874e7e21b5b43a5c (diff)
TaskBarIcon doesn't seem to work on OS X any more, either.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic_server.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index dc640ff03..9c4832138 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -210,13 +210,7 @@ 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"));
@@ -292,7 +286,7 @@ private:
*/
Config::instance();
-#ifdef DCPOMATIC_LINUX
+#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
StatusDialog* d = new StatusDialog ();
d->Show ();
#else