Graphics rearrangement and probably breakage.

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 382f867cac214bd72dc245cab00f2670a15f651a..72ac66706942a5efd8b456664a3b8968c80aba44 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -105,16 +105,16 @@ class TaskBarIcon : public wxTaskBarIcon
 public:
        TaskBarIcon ()
        {
-#ifdef __WXMSW__
+#ifdef DCPOMATIC_WINDOWS
                wxIcon icon (std_to_wx ("taskbar_icon"));
 #endif
-#ifdef __WXGTK__
+#ifdef DCPOMATIC_LINUX
                wxInitAllImageHandlers();
-               wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG);
+               wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG);
                wxIcon icon;
                icon.CopyFromBitmap (bitmap);
 #endif
-#ifndef __WXOSX__
+#ifndef DCPOMATIC_OSX
                /* XXX: fix this for OS X */
                SetIcon (icon, std_to_wx ("DCP-o-matic encode server"));
 #endif