No-op; rename a whole load of wx constants to their shorter equivalents.

[dcpomatic.git] / src / tools / dcpomatic_server.cc

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 08a04f35cda0e753b240c40dd87630ae0beda87a..cd09aebf864ed395ffb0813d3b7abf84153c1514 100644 (file)
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -25,7 +25,6 @@
 #include "lib/encode_server.h"
 #include "lib/config.h"
 #include "lib/log.h"
-#include "lib/raw_convert.h"
 #include "lib/signaller.h"
 #include "lib/cross.h"
 #include <wx/taskbar.h>
@@ -191,9 +190,7 @@ private:
 
        void update_state ()
        {
-               locked_stringstream s;
-               s << fixed << setprecision(1) << server_log->fps ();
-               _fps->SetLabel (std_to_wx (s.str()));
+               _fps->SetLabel (wxString::Format ("%.1f", server_log->fps()));
        }
 
        wxTextCtrl* _text;
@@ -218,8 +215,8 @@ public:
 
                SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::status, this), ID_status);
-               Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&TaskBarIcon::quit, this), ID_quit);
+               Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::status, this), ID_status);
+               Bind (wxEVT_MENU, boost::bind (&TaskBarIcon::quit, this), ID_quit);
        }
 
        wxMenu* CreatePopupMenu ()