summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-05-25 09:13:28 +0100
committerCarl Hetherington <cth@carlh.net>2017-05-25 09:13:28 +0100
commitd81704ba871e048eca2f6a5428d22570ac9c24da (patch)
treefbd8b27561fc76efab8a64eb540057f4a4748552 /src
parent8e2d3d6c051b1385d5df4f58691e3a694f13a1d4 (diff)
New OS X menu bar icon for server.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic_server.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 8e9ce7537..9214d8385 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -208,7 +208,12 @@ public:
wxIcon icon (std_to_wx ("id"));
#else
wxInitAllImageHandlers();
+#ifdef DCPOMATIC_LINUX
wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
+#ifdef DCPOMATIC_OSX
+ wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+#endif
wxIcon icon;
icon.CopyFromBitmap (bitmap);
#endif