From 07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 18 Feb 2019 00:13:11 +0000 Subject: [PATCH] TaskBarIcon doesn't seem to work on OS X any more, either. --- src/tools/dcpomatic_server.cc | 8 +------- 1 file changed, 1 insertion(+), 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 -- 2.30.2