projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
82fcadc
)
OSX tweaks.
author
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 00:55:47 +0000
(
01:55
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 9 Oct 2015 12:45:09 +0000
(13:45 +0100)
src/tools/dcpomatic_server.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_server.cc
b/src/tools/dcpomatic_server.cc
index 978f600b2deecf829a256cc8451913ef07f16d1e..19271d66bab581bb86f347c118362c883767d2b8 100644
(file)
--- 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_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
#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"));
#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
status ();
#endif
@@
-190,6
+184,14
@@
private:
_timer.reset (new wxTimer (this));
_timer->Start (1000);
_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;
}
return true;
}