TaskBarIcon doesn't seem to work on OS X any more, either.
authorCarl Hetherington <cth@carlh.net>
Mon, 18 Feb 2019 00:13:11 +0000 (00:13 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 18 Feb 2019 00:13:11 +0000 (00:13 +0000)
src/tools/dcpomatic_server.cc

index dc640ff033964a9b33993dc0571b81bb915b6d2d..9c483213830affc100d8b2356505bdee7ccb27f0 100644 (file)
@@ -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