X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffocus_manager.cc;h=9f1aa7df883895ede05dd3deca7cd33e18cd65c4;hb=925d97b8e51421bf509c5ffbe4abe8f77a6ca95e;hp=e10075f3ad30418c2eb2e5a7712753ad3e1e054c;hpb=c622a06189181a3a6ad356094c9a3cf4e1f5a722;p=dcpomatic.git diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc index e10075f3a..9f1aa7df8 100644 --- a/src/wx/focus_manager.cc +++ b/src/wx/focus_manager.cc @@ -18,14 +18,22 @@ */ + #include "focus_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS + + +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + FocusManager* FocusManager::_instance; + FocusManager * FocusManager::instance() {