X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=d29ac0a6367ff56a0314f217b3314936d3438114;hb=394c8347d54057c8a52dd63704ae2c9791bb30aa;hp=64bbb3049504139195485572cd6f46b78ec11bf6;hpb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 64bbb3049..d29ac0a63 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -20,6 +20,7 @@
 
 #include "wx/wx_util.h"
 #include "wx/wx_signal_manager.h"
+#include "wx/static_text.h"
 #include "lib/util.h"
 #include "lib/encoded_log_entry.h"
 #include "lib/encode_server.h"
@@ -147,7 +148,7 @@ public:
 		wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
 
 		add_label_to_sizer (state_sizer, this, _("Frames per second"), true);
-		_fps = new wxStaticText (this, wxID_ANY, wxT(""));
+		_fps = new StaticText (this, wxT(""));
 		state_sizer->Add (_fps);
 
 		wxFlexGridSizer* log_sizer = new wxFlexGridSizer (1, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@ -209,7 +210,6 @@ public:
 #ifdef DCPOMATIC_WINDOWS
 		wxIcon icon (std_to_wx ("id"));
 #else
-		wxInitAllImageHandlers();
 #ifdef DCPOMATIC_LINUX
 		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic2_server_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
 #endif
@@ -268,6 +268,8 @@ private:
 			return false;
 		}
 
+		wxInitAllImageHandlers ();
+
 		server_log.reset (new ServerLog);
 		dcpomatic_log = server_log;