summaryrefslogtreecommitdiff
path: root/src/wx/controls.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-09-14 20:10:36 +0100
committerCarl Hetherington <cth@carlh.net>2018-09-14 20:10:36 +0100
commit45dcdd17c7f860e92d7b1d75598afea64c5fbc50 (patch)
tree6de56b0737eb9a38553598d3ce37bddf4b214c53 /src/wx/controls.cc
parent15895d47cebc0988aecf0a6b84947f4b6bae9aa3 (diff)
Basic dual-screen mode for player.
Diffstat (limited to 'src/wx/controls.cc')
-rw-r--r--src/wx/controls.cc22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index de0060d64..feef2e91c 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -15,7 +15,7 @@ using boost::weak_ptr;
/** @param outline_content true if viewer should present an "outline content" checkbox.
* @param jump_to_selected true if viewer should present a "jump to selected" checkbox.
*/
-Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outline_content, bool jump_to_selected)
+Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outline_content, bool jump_to_selected, bool eye)
: wxPanel (parent)
, _viewer (viewer)
, _slider_being_moved (false)
@@ -40,11 +40,13 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outlin
view_options->Add (_outline_content, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
}
- _eye = new wxChoice (this, wxID_ANY);
- _eye->Append (_("Left"));
- _eye->Append (_("Right"));
- _eye->SetSelection (0);
- view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+ if (eye) {
+ _eye = new wxChoice (this, wxID_ANY);
+ _eye->Append (_("Left"));
+ _eye->Append (_("Right"));
+ _eye->SetSelection (0);
+ view_options->Add (_eye, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_GAP);
+ }
if (jump_to_selected) {
_jump_to_selected = new wxCheckBox (this, wxID_ANY, _("Jump to selected content"));
@@ -73,7 +75,9 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool outlin
_back_button->SetMinSize (wxSize (32, -1));
_forward_button->SetMinSize (wxSize (32, -1));
- _eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this));
+ if (_eye) {
+ _eye->Bind (wxEVT_CHOICE, boost::bind (&Controls::eye_changed, this));
+ }
if (_outline_content) {
_outline_content->Bind (wxEVT_CHECKBOX, boost::bind (&Controls::outline_content_changed, this));
}
@@ -314,7 +318,9 @@ Controls::setup_sensitivity ()
_jump_to_selected->Enable (c);
}
- _eye->Enable (c && _film->three_d ());
+ if (_eye) {
+ _eye->Enable (c && _film->three_d ());
+ }
}
void