projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dolby is apparently recreating all their certificates (as they will soon expire)...
[dcpomatic.git]
/
src
/
wx
/
focus_manager.cc
diff --git
a/src/wx/focus_manager.cc
b/src/wx/focus_manager.cc
index e10075f3ad30418c2eb2e5a7712753ad3e1e054c..9f1aa7df883895ede05dd3deca7cd33e18cd65c4 100644
(file)
--- a/
src/wx/focus_manager.cc
+++ b/
src/wx/focus_manager.cc
@@
-18,14
+18,22
@@
*/
*/
+
#include "focus_manager.h"
#include "focus_manager.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/textctrl.h>
#include <wx/textctrl.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
+
+
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
FocusManager* FocusManager::_instance;
FocusManager* FocusManager::_instance;
+
FocusManager *
FocusManager::instance()
{
FocusManager *
FocusManager::instance()
{