projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8665529
)
Fix controls in main DoM some more.
author
Carl Hetherington
<cth@carlh.net>
Tue, 27 Nov 2018 22:43:09 +0000
(22:43 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 27 Nov 2018 22:43:09 +0000
(22:43 +0000)
src/tools/dcpomatic.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic.cc
b/src/tools/dcpomatic.cc
index 7197ee8cace71b004665e2e40f61734a0a69ca27..c1edbe481ea878355bbaec02aca6290c5f7343dc 100644
(file)
--- a/
src/tools/dcpomatic.cc
+++ b/
src/tools/dcpomatic.cc
@@
-22,7
+22,7
@@
* @brief The main DCP-o-matic GUI.
*/
* @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"
#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));
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);
_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;
FilmEditor* _film_editor;
boost::shared_ptr<FilmViewer> _film_viewer;
- Controls* _controls;
+
Standard
Controls* _controls;
VideoWaveformDialog* _video_waveform_dialog;
HintsDialog* _hints_dialog;
ServersListDialog* _servers_list_dialog;
VideoWaveformDialog* _video_waveform_dialog;
HintsDialog* _hints_dialog;
ServersListDialog* _servers_list_dialog;