diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
| commit | e60bb3e51bd1508b149e6b8f6608f09b5196ae26 (patch) | |
| tree | a7a5b937c9ae138d4eebca8d5130d308bf9ae420 /src/tools/dcpomatic_server.cc | |
| parent | f07d5125a7b609320682689abe40781f096ca25e (diff) | |
No-op: remove all trailing whitespace.
Diffstat (limited to 'src/tools/dcpomatic_server.cc')
| -rw-r--r-- | src/tools/dcpomatic_server.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc index 8107949f5..37eeb1e8e 100644 --- a/src/tools/dcpomatic_server.cc +++ b/src/tools/dcpomatic_server.cc @@ -61,7 +61,7 @@ private: _log = m; } - string _log; + string _log; }; static shared_ptr<MemoryLog> memory_log (new MemoryLog); @@ -103,7 +103,7 @@ class TaskBarIcon : public wxTaskBarIcon public: TaskBarIcon () { -#ifdef __WXMSW__ +#ifdef __WXMSW__ wxIcon icon (std_to_wx ("taskbar_icon")); #endif #ifdef __WXGTK__ @@ -115,12 +115,12 @@ public: #ifndef __WXOSX__ /* XXX: fix this for OS X */ SetIcon (icon, std_to_wx ("DCP-o-matic encode server")); -#endif +#endif Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status); Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit); } - + wxMenu* CreatePopupMenu () { wxMenu* menu = new wxMenu; @@ -151,14 +151,14 @@ public: , _icon (0) {} -private: - +private: + bool OnInit () { if (!wxApp::OnInit ()) { return false; } - + dcpomatic_setup (); _icon = new TaskBarIcon; @@ -167,7 +167,7 @@ private: Bind (wxEVT_TIMER, boost::bind (&App::check, this)); _timer.reset (new wxTimer (this)); _timer->Start (1000); - + return true; } |