Extract common code out into kdm_for_screen()

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

diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index dc640ff033964a9b33993dc0571b81bb915b6d2d..cb4779ee3722c949278a7bdb1f4b4501f0a83164 100644 (file)
--- 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));
@@ -308,6 +306,8 @@ private:
                        splash->Destroy ();
                }
 
+               SetExitOnFrameDelete (false);
+
                return true;
        }
 
@@ -353,7 +353,7 @@ private:
                message_dialog (0, std_to_wx (m));
        }
 
-       boost::thread* _thread;
+       boost::thread _thread;
        TaskBarIcon* _icon;
        shared_ptr<wxTimer> _timer;
 };