diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-10 20:51:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-11 01:13:09 +0000 |
| commit | a40e9852ea159602b63f9d0af16a039862703c14 (patch) | |
| tree | c41e71fb13a43c295a60fff15e8bb36505c3dae7 /src | |
| parent | fb4c71b09a677d55aefdd24058ba5c3eeacd3618 (diff) | |
Revert "TaskBarIcon doesn't seem to work on OS X any more, either."
This reverts commit 07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 8 |
1 files changed, 7 insertions, 1 deletions
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 |