diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-09 01:55:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:45:09 +0100 |
| commit | 5397b80ebe200293aa19b439d2273a1cf24dbf52 (patch) | |
| tree | 7d720f924588a839f15f9c0bffd6c23be58d484d /src/tools | |
| parent | 82fcadc063b286db72b3350923f3a9ba52a029f9 (diff) | |
OSX tweaks.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 978f600b2..19271d66b 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -116,23 +116,17 @@ public: #ifdef DCPOMATIC_WINDOWS wxIcon icon (std_to_wx ("taskbar_icon")); #endif + #ifdef DCPOMATIC_LINUX wxInitAllImageHandlers(); wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), LINUX_SHARE_PREFIX), wxBITMAP_TYPE_PNG); wxIcon icon; icon.CopyFromBitmap (bitmap); #endif + #ifndef DCPOMATIC_OSX SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); -#endif - -#ifdef DCPOMATIC_OSX - wxMenu* file = new wxMenu; - file->Append (wxID_EXIT, _("&Exit")); - wxMenuBar* bar = new wxMenuBar; - bar->Append (file, _("&File")); - SetMenuBar (bar); - +#else status (); #endif @@ -190,6 +184,14 @@ private: _timer.reset (new wxTimer (this)); _timer->Start (1000); +#ifdef DCPOMATIC_OSX + wxMenu* file = new wxMenu; + file->Append (wxID_EXIT, _("&Exit")); + wxMenuBar* bar = new wxMenuBar; + bar->Append (file, _("&File")); + SetMenuBar (bar); +#endif + return true; } |