More enum class additions.

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

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 86329efb39425f8f4ff40b88cf52751df7f5d4f5..31134340054b2ed232548068ed4bcfad42caeea0 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -49,9 +49,9 @@ using std::cout;
 using std::make_pair;
 using std::exception;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::weak_ptr;
+using std::dynamic_pointer_cast;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
@@ -97,10 +97,10 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
        time_sizer->Add (_frame_number, 0, wxEXPAND);
        time_sizer->Add (_timecode, 0, wxEXPAND);
 
-       h_sizer->Add (_rewind_button, 0, wxALL, 2);
+       h_sizer->Add (_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
        h_sizer->Add (time_sizer, 0, wxEXPAND);
-       h_sizer->Add (_back_button, 0, wxALL, 2);
-       h_sizer->Add (_forward_button, 0, wxALL, 2);
+       h_sizer->Add (_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
+       h_sizer->Add (_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 
        _button_sizer = new wxBoxSizer (wxHORIZONTAL);
        h_sizer->Add (_button_sizer, 0, wxEXPAND);
@@ -190,7 +190,7 @@ Controls::update_position ()
 void
 Controls::eye_changed ()
 {
-       _viewer->set_eyes (_eye->GetSelection() == 0 ? EYES_LEFT : EYES_RIGHT);
+       _viewer->set_eyes (_eye->GetSelection() == 0 ? Eyes::LEFT : Eyes::RIGHT);
 }
 
 void
@@ -407,7 +407,7 @@ Controls::film () const
 void
 Controls::film_change (ChangeType type, Film::Property p)
 {
-       if (type == CHANGE_TYPE_DONE) {
+       if (type == ChangeType::DONE) {
                if (p == Film::CONTENT) {
                        setup_sensitivity ();
                        update_position_label ();