Disable warnings around all wx includes.

[dcpomatic.git] / src / wx / markers_dialog.cc

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 11a76548e002e049b281d8ffc25d6efadea25d77..5d66116914247ab6b59d46b8b5e241a2a4718ce4 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -18,27 +18,31 @@
 
 */
 
-#include "markers_dialog.h"
-#include "wx_util.h"
-#include "timecode.h"
-#include "static_text.h"
-#include "dcpomatic_button.h"
+
 #include "check_box.h"
+#include "dcpomatic_button.h"
 #include "film_viewer.h"
+#include "markers_dialog.h"
+#include "static_text.h"
+#include "timecode.h"
+#include "wx_util.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
-#include <iostream>
 
-using std::cout;
+
+using std::make_shared;
 using std::shared_ptr;
 using std::weak_ptr;
-using std::make_shared;
-using boost::optional;
 using boost::bind;
+using boost::optional;
 using dcpomatic::DCPTime;
 
+
 class Marker
 {
 public:
@@ -66,11 +70,17 @@ public:
                set_sensitivity ();
 
                set_button->Bind (wxEVT_BUTTON, bind(&Marker::set, this));
-               checkbox->Bind (wxEVT_CHECKBOX, bind(&Marker::set_sensitivity, this));
+               checkbox->Bind (wxEVT_CHECKBOX, bind(&Marker::checkbox_clicked, this));
                timecode->Changed.connect (bind(&Marker::changed, this));
        }
 
 private:
+       void checkbox_clicked ()
+       {
+               set_sensitivity ();
+               changed ();
+       }
+
        void set_sensitivity ()
        {
                timecode->Enable (checkbox->GetValue());
@@ -91,10 +101,11 @@ private:
        {
                auto f = film.lock ();
                DCPOMATIC_ASSERT (f);
-               auto tc = timecode->get(f->video_frame_rate());
+               auto vfr = f->video_frame_rate();
+               auto tc = timecode->get(vfr);
                if (tc >= f->length()) {
-                       tc = f->length();
-                       timecode->set (tc, f->video_frame_rate());
+                       tc = f->length() - DCPTime::from_frames(1, vfr);
+                       timecode->set (tc, vfr);
                }
                if (checkbox->GetValue()) {
                        f->set_marker (type, tc);
@@ -111,6 +122,7 @@ private:
        Button* set_button;
 };
 
+
 MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<FilmViewer> viewer)
        : wxDialog (parent, wxID_ANY, _("Markers"))
        , _film (film)
@@ -131,5 +143,11 @@ MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<Fi
        _markers.push_back (make_shared<Marker>(this, grid, r++, film, viewer, _("Last frame of moving credits"), dcp::Marker::LFMC));
 
        sizer->Add (grid, 0, wxALL, 8);
+
+       auto buttons = CreateSeparatedButtonSizer (wxCLOSE);
+       if (buttons) {
+               sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+       }
+
        SetSizerAndFit (sizer);
 }