projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Shift+scrollwheel to move left/right in the timeline.
[dcpomatic.git]
/
src
/
wx
/
export_subtitles_dialog.h
diff --git
a/src/wx/export_subtitles_dialog.h
b/src/wx/export_subtitles_dialog.h
index c53df820ef1a6630178591643b87d40a5c73a2ae..0a3177cac8b53b7562ce30ba596697dcc677bffc 100644
(file)
--- a/
src/wx/export_subtitles_dialog.h
+++ b/
src/wx/export_subtitles_dialog.h
@@
-21,13
+21,14
@@
#include "dir_picker_ctrl.h"
#include "table_dialog.h"
#include "dir_picker_ctrl.h"
#include "table_dialog.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
+class CheckBox;
class FilePickerCtrl;
class FilePickerCtrl;
@@
-44,8
+45,8
@@
private:
void setup_sensitivity ();
bool _interop;
void setup_sensitivity ();
bool _interop;
-
wx
CheckBox* _split_reels;
-
wx
CheckBox* _include_font;
+ CheckBox* _split_reels;
+ CheckBox* _include_font;
wxStaticText* _file_label;
FilePickerCtrl* _file;
DirPickerCtrl* _dir;
wxStaticText* _file_label;
FilePickerCtrl* _file;
DirPickerCtrl* _dir;