summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-05-29 12:00:36 +0100
committerCarl Hetherington <cth@carlh.net>2013-05-29 12:00:36 +0100
commit003de48cd0371a60d095dc9d02ed5763c410cf5e (patch)
treebfa4ac0a8076535d98b2dca27e9cc31c29706265 /src/tools
parent3a72d3e7af018d4e4474d48d9007841a0c63c020 (diff)
Build fixes for OS X.
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/servomatic_gui.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc
index 5e36660eb..000c2019f 100644
--- a/src/tools/servomatic_gui.cc
+++ b/src/tools/servomatic_gui.cc
@@ -102,8 +102,11 @@ public:
wxBitmap bitmap (wxString::Format (wxT ("%s/taskbar_icon.png"), POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG);
wxIcon icon;
icon.CopyFromBitmap (bitmap);
-#endif
+#endif
+#ifndef __WXOSX__
+ /* XXX: fix this for OS X */
SetIcon (icon, std_to_wx ("DVD-o-matic encode server"));
+#endif
Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status));
Connect (ID_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::quit));