Revert "TaskBarIcon doesn't seem to work on OS X any more, either."
authorCarl Hetherington <cth@carlh.net>
Sun, 10 Mar 2019 20:51:14 +0000 (20:51 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Mar 2019 01:13:09 +0000 (01:13 +0000)
This reverts commit 07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579.

src/tools/dcpomatic_server.cc

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