X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=cb4779ee3722c949278a7bdb1f4b4501f0a83164;hp=ab3e5b258d241a6c6f808fc2c6a36b5ca2049393;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=f9d8d9fcac87fa45517cebb0bb1d5c5c1ffc39ee

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index ab3e5b258..cb4779ee3 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -72,11 +72,6 @@ public:
 		return a;
 	}
 
-	string head_and_tail (int) const {
-		/* Not necessary */
-		return "";
-	}
-
 	float fps () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _fps;
@@ -145,7 +140,11 @@ public:
 		: wxDialog (
 			0, wxID_ANY, _("DCP-o-matic Encode Server"),
 			wxDefaultPosition, wxDefaultSize,
+#ifdef DCPOMATIC_OSX
+			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxSTAY_ON_TOP
+#else
 			wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER
+#endif
 			)
 	{
 		wxFlexGridSizer* state_sizer = new wxFlexGridSizer (2, DCPOMATIC_SIZER_GAP, DCPOMATIC_SIZER_GAP);
@@ -254,7 +253,6 @@ class App : public wxApp, public ExceptionStore
 public:
 	App ()
 		: wxApp ()
-		, _thread (0)
 		, _icon (0)
 	{}
 
@@ -298,7 +296,7 @@ private:
 #else
 		_icon = new TaskBarIcon;
 #endif
-		_thread = new thread (bind (&App::main_thread, this));
+		_thread = thread (bind (&App::main_thread, this));
 
 		Bind (wxEVT_TIMER, boost::bind (&App::check, this));
 		_timer.reset (new wxTimer (this));
@@ -355,7 +353,7 @@ private:
 		message_dialog (0, std_to_wx (m));
 	}
 
-	boost::thread* _thread;
+	boost::thread _thread;
 	TaskBarIcon* _icon;
 	shared_ptr<wxTimer> _timer;
 };