Cleanup: use some defaults in the class definition.

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index b9eebade5317ad96ad488bbf763ca1bd9075ae3f..84923d467edd74d7f7c100930d8dd1b237abfeb2 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -71,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(">")))

diff --git a/src/wx/controls.h b/src/wx/controls.h
index f04f3aab6c60cc27bb4a02d7858131930b16fdb5..321d7e05c0868fa1083135d443f82160dd90590b 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -106,11 +106,11 @@ private:
 
        typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
-       bool _slider_being_moved;
+       bool _slider_being_moved = false;
 
-       CheckBox* _outline_content;
-       wxChoice* _eye;
-       CheckBox* _jump_to_selected;
+       CheckBox* _outline_content = nullptr;
+       wxChoice* _eye = nullptr;
+       CheckBox* _jump_to_selected = nullptr;
        wxButton* _rewind_button;
        wxButton* _back_button;
        wxButton* _forward_button;