Add delete-key shortcut to remove content.

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

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index c05a271f7bfbfa6c8095b6eefcfe01db5c570618..1e990c49515c13393c403c3e7c7680f807e6f3a3 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -60,9 +60,9 @@ add_label_to_sizer (wxSizer* s, wxWindow* p, wxString t, bool, int prop)
 
 wxStaticText *
 #ifdef __WXOSX__
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool left, wxGBPosition pos, wxGBSpan span)
 #else
-add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
+add_label_to_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, wxGBPosition pos, wxGBSpan span)
 #endif
 {
        int flags = wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT;
@@ -84,7 +84,19 @@ add_label_to_grid_bag_sizer (wxGridBagSizer* s, wxWindow* p, wxString t, bool, w
 void
 error_dialog (wxWindow* parent, wxString m)
 {
-       wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK);
+       wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_ERROR);
+       d->ShowModal ();
+       d->Destroy ();
+}
+
+/** Pop up an error dialogue box.
+ *  @param parent Parent.
+ *  @param m Message.
+ */
+void
+message_dialog (wxWindow* parent, wxString m)
+{
+       wxMessageDialog* d = new wxMessageDialog (parent, m, _("DCP-o-matic"), wxOK | wxICON_INFORMATION);
        d->ShowModal ();
        d->Destroy ();
 }
@@ -332,7 +344,7 @@ context_translation (wxString s)
 }
 
 wxString
-time_to_timecode (DCPTime t, float fps)
+time_to_timecode (DCPTime t, double fps)
 {
        double w = t.seconds ();
        int const h = (w / 3600);
@@ -341,6 +353,6 @@ time_to_timecode (DCPTime t, float fps)
        w -= m * 60;
        int const s = floor (w);
        w -= s;
-       int const f = rint (w * fps);
+       int const f = lrint (w * fps);
        return wxString::Format (wxT("%02d:%02d:%02d.%02d"), h, m, s, f);
 }