X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_server.cc;h=cb4779ee3722c949278a7bdb1f4b4501f0a83164;hb=722aa0353914f07531867bee147149895324a964;hp=9c483213830affc100d8b2356505bdee7ccb27f0;hpb=07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index 9c4832138..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);
@@ -210,7 +209,13 @@ public:
 	TaskBarIcon ()
 		: _status (0)
 	{
+#ifdef DCPOMATIC_WINDOWS
 		wxIcon icon (std_to_wx ("id"));
+#else
+		wxBitmap bitmap (wxString::Format (wxT ("%s/dcpomatic_small.png"), std_to_wx (shared_path().string())), wxBITMAP_TYPE_PNG);
+		wxIcon icon;
+		icon.CopyFromBitmap (bitmap);
+#endif
 
 		SetIcon (icon, std_to_wx ("DCP-o-matic Encode Server"));
 
@@ -248,7 +253,6 @@ class App : public wxApp, public ExceptionStore
 public:
 	App ()
 		: wxApp ()
-		, _thread (0)
 		, _icon (0)
 	{}
 
@@ -286,13 +290,13 @@ private:
 		*/
 		Config::instance();
 
-#if defined(DCPOMATIC_LINUX) || defined(DCPOMATIC_OSX)
+#ifdef DCPOMATIC_LINUX
 		StatusDialog* d = new StatusDialog ();
 		d->Show ();
 #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));
@@ -302,6 +306,8 @@ private:
 			splash->Destroy ();
 		}
 
+		SetExitOnFrameDelete (false);
+
 		return true;
 	}
 
@@ -347,7 +353,7 @@ private:
 		message_dialog (0, std_to_wx (m));
 	}
 
-	boost::thread* _thread;
+	boost::thread _thread;
 	TaskBarIcon* _icon;
 	shared_ptr<wxTimer> _timer;
 };