summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-27 22:43:09 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-27 22:43:09 +0000
commit3318997be3f276e874d0c28fafa99d3b0036421a (patch)
treeedd7376470e3a8c709e030e0cf6e8f3f723b9fe8 /src
parent866552989b82ed28964172fce1dd6b787589f8d7 (diff)
Fix controls in main DoM some more.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 7197ee8ca..c1edbe481 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -22,7 +22,7 @@
* @brief The main DCP-o-matic GUI.
*/
-#include "wx/controls.h"
+#include "wx/standard_controls.h"
#include "wx/film_viewer.h"
#include "wx/film_editor.h"
#include "wx/job_manager_view.h"
@@ -324,7 +324,7 @@ public:
wxPanel* overall_panel = new wxPanel (this, wxID_ANY);
_film_viewer.reset (new FilmViewer (overall_panel));
- _controls = new Controls (overall_panel, _film_viewer);
+ _controls = new StandardControls (overall_panel, _film_viewer, true);
_film_editor = new FilmEditor (overall_panel, _film_viewer);
JobManagerView* job_manager_view = new JobManagerView (overall_panel, false);
@@ -1335,7 +1335,7 @@ private:
FilmEditor* _film_editor;
boost::shared_ptr<FilmViewer> _film_viewer;
- Controls* _controls;
+ StandardControls* _controls;
VideoWaveformDialog* _video_waveform_dialog;
HintsDialog* _hints_dialog;
ServersListDialog* _servers_list_dialog;