Cleanup: use some defaults in the class definition.

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

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 804b59daec390173e28931f9e65fb6c2f8397f8e..84923d467edd74d7f7c100930d8dd1b237abfeb2 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -28,6 +28,7 @@
 #include "playhead_to_frame_dialog.h"
 #include "playhead_to_timecode_dialog.h"
 #include "static_text.h"
+#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/content_factory.h"
 #include "lib/cross.h"
@@ -70,10 +71,6 @@ Controls::Controls(wxWindow* parent, FilmViewer& viewer, bool editor_controls)
        , _markers (new MarkersPanel(this, viewer))
        , _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096))
        , _viewer (viewer)
-       , _slider_being_moved (false)
-       , _outline_content (0)
-       , _eye (0)
-       , _jump_to_selected (0)
        , _rewind_button (new Button(this, wxT("|<")))
        , _back_button (new Button(this, wxT("<")))
        , _forward_button (new Button(this, wxT(">")))
@@ -381,8 +378,7 @@ Controls::setup_sensitivity ()
 void
 Controls::timecode_clicked ()
 {
-       auto dialog = new PlayheadToTimecodeDialog(this, _viewer.position(), _film->video_frame_rate());
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       auto dialog = make_wx<PlayheadToTimecodeDialog>(this, _viewer.position(), _film->video_frame_rate());
 
        if (dialog->ShowModal() == wxID_OK) {
                _viewer.seek(dialog->get(), true);
@@ -393,8 +389,7 @@ Controls::timecode_clicked ()
 void
 Controls::frame_number_clicked ()
 {
-       auto dialog = new PlayheadToFrameDialog(this, _viewer.position(), _film->video_frame_rate());
-       ScopeGuard sg = [dialog]() { dialog->Destroy(); };
+       auto dialog = make_wx<PlayheadToFrameDialog>(this, _viewer.position(), _film->video_frame_rate());
 
        if (dialog->ShowModal() == wxID_OK) {
                _viewer.seek(dialog->get(), true);