projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix (I think) some strange situations where ::get() on dialogs
[dcpomatic.git]
/
src
/
wx
/
timeline_dialog.cc
diff --git
a/src/wx/timeline_dialog.cc
b/src/wx/timeline_dialog.cc
index 975f7cd9d6c375802c1b684296e2ff8138fcd21e..c7f057b1ebfacd286aa38cb6ed519a0bfa918803 100644
(file)
--- a/
src/wx/timeline_dialog.cc
+++ b/
src/wx/timeline_dialog.cc
@@
-26,15
+26,16
@@
#include "lib/compose.hpp"
#include "lib/cross.h"
#include "lib/playlist.h"
#include "lib/compose.hpp"
#include "lib/cross.h"
#include "lib/playlist.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
#include <list>
using std::list;
#include <list>
using std::list;
-using std::cout;
-using std::string;
using std::shared_ptr;
using std::shared_ptr;
+using std::string;
using std::weak_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
using std::weak_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;