diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-29 19:58:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-29 19:58:12 +0100 |
| commit | 37258f4ee74582feaac8b311baaeb27bf5f17ac9 (patch) | |
| tree | 800d62c9832326c3760eb8c6bcc899a7c08e54a2 /src/tools | |
| parent | d3e2e0dfd6f840f01a86590cca3ba3315c146710 (diff) | |
| parent | b1da49fd4f3bc918de2ee4cdf49959258576977c (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/servomatic_gui.cc | 5 |
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)); |