projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Supporters update.
[dcpomatic.git]
/
src
/
wx
/
text_panel.cc
diff --git
a/src/wx/text_panel.cc
b/src/wx/text_panel.cc
index 24646b78ac56704e1ee3636ff39a5ffcdac6d7c4..42dace9ba81e817847ad159a8515507ab425a3a4 100644
(file)
--- a/
src/wx/text_panel.cc
+++ b/
src/wx/text_panel.cc
@@
-45,7
+45,10
@@
#include "lib/string_text_file_decoder.h"
#include "lib/subtitle_analysis.h"
#include "lib/text_content.h"
#include "lib/string_text_file_decoder.h"
#include "lib/subtitle_analysis.h"
#include "lib/text_content.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/spinctrl.h>
#include <wx/spinctrl.h>
+LIBDCP_ENABLE_WARNINGS
using std::cout;
using std::cout;
@@
-875,7
+878,7
@@
TextPanel::update_outline_subtitles_in_viewer ()
}
fv->set_outline_subtitles (rect);
} else {
}
fv->set_outline_subtitles (rect);
} else {
- fv->set_outline_subtitles (
optional<dcpomatic::Rect<double> >()
);
+ fv->set_outline_subtitles (
{}
);
}
}
}
}