diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
| commit | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (patch) | |
| tree | 9aaa33632f2c41e8c3129543c8214c8c3d7274cb /src/wx | |
| parent | 9e93c860759b8d04277596781706488f59a3cc12 (diff) | |
| parent | c37c744bbb236b1fd39f86e4f0ab36652d403d67 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/dci_name_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/wx/dci_name_dialog.cc b/src/wx/dci_name_dialog.cc index 88cc7efa4..ee8864ff9 100644 --- a/src/wx/dci_name_dialog.cc +++ b/src/wx/dci_name_dialog.cc @@ -53,7 +53,7 @@ DCINameDialog::DCINameDialog (wxWindow* parent, Film* film) _facility = new wxTextCtrl (this, wxID_ANY); table->Add (_facility, 1, wxEXPAND); - add_label_to_sizer (table, this, "Package Type (e.g. OV"); + add_label_to_sizer (table, this, "Package Type (e.g. OV)"); _package_type = new wxTextCtrl (this, wxID_ANY); table->Add (_package_type, 1, wxEXPAND); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 22063256f..471ca215f 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -67,7 +67,7 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent) _use_dci_name = new wxCheckBox (this, wxID_ANY, wxT ("Use DCI name")); _sizer->Add (_use_dci_name, 1, wxEXPAND); - _edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Edit...")); + _edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Details...")); _sizer->Add (_edit_dci_button, 0); add_label_to_sizer (_sizer, this, "Content"); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index c42ffaeeb..6c8f38cfc 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -232,8 +232,8 @@ FilmViewer::FilmViewer (Film* f, wxWindow* p) _thumb_panel = new ThumbPanel (this, f); _sizer->Add (_thumb_panel, 1, wxEXPAND); - int const max = f ? f->num_thumbs() - 1 : 0; - _slider = new wxSlider (this, wxID_ANY, 0, 0, max); + int const m = max (1, f ? f->num_thumbs() - 1 : 0); + _slider = new wxSlider (this, wxID_ANY, 0, 0, m); _sizer->Add (_slider, 0, wxEXPAND | wxLEFT | wxRIGHT); set_thumbnail (0); |