diff options
Diffstat (limited to 'src/wx')
35 files changed, 109 insertions, 0 deletions
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc index fadda5951..a7d43ece8 100644 --- a/src/wx/audio_dialog.cc +++ b/src/wx/audio_dialog.cc @@ -42,6 +42,9 @@ using boost::bind; using boost::optional; using boost::const_pointer_cast; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif /** @param parent Parent window. * @param film Film we are using. diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 634d2fe73..32f423380 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -46,6 +46,9 @@ using std::pair; using std::make_pair; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; #define INDICATOR_SIZE 20 diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc index ccdb57907..b2889270f 100644 --- a/src/wx/audio_panel.cc +++ b/src/wx/audio_panel.cc @@ -46,6 +46,9 @@ using std::pair; using boost::dynamic_pointer_cast; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif AudioPanel::AudioPanel (ContentPanel* p) : ContentSubPanel (p, _("Audio")) diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc index a4156a0e6..20ff888ce 100644 --- a/src/wx/barco_alchemy_certificate_panel.cc +++ b/src/wx/barco_alchemy_certificate_panel.cc @@ -27,6 +27,9 @@ using std::string; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif BarcoAlchemyCertificatePanel::BarcoAlchemyCertificatePanel (DownloadCertificateDialog* dialog) : DownloadCertificatePanel (dialog) diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc index 43a9a2432..8877e998e 100644 --- a/src/wx/christie_certificate_panel.cc +++ b/src/wx/christie_certificate_panel.cc @@ -27,6 +27,9 @@ using std::string; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* dialog) : DownloadCertificatePanel (dialog) diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc index 36aabf776..836d521bb 100644 --- a/src/wx/cinema_dialog.cc +++ b/src/wx/cinema_dialog.cc @@ -31,6 +31,9 @@ using std::back_inserter; using std::list; using std::cout; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static string column (string s) diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index fecb55ea7..f6fb3c948 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -34,6 +34,9 @@ using boost::bind; using boost::optional; using boost::shared_ptr; using boost::function; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static bool diff --git a/src/wx/confirm_kdm_email_dialog.cc b/src/wx/confirm_kdm_email_dialog.cc index eca34b5cf..381658dab 100644 --- a/src/wx/confirm_kdm_email_dialog.cc +++ b/src/wx/confirm_kdm_email_dialog.cc @@ -28,6 +28,9 @@ using std::list; using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif ConfirmKDMEmailDialog::ConfirmKDMEmailDialog (wxWindow* parent, list<string> emails) : QuestionDialog (parent, _("Confirm KDM email"), _("Send emails"), _("Don't send emails")) diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc index 9a3e5ce9a..123e1f051 100644 --- a/src/wx/content_panel.cc +++ b/src/wx/content_panel.cc @@ -61,6 +61,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif class LimitedSplitter : public wxSplitterWindow { diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc index 5cdd2e5c3..0f32b8b61 100644 --- a/src/wx/content_sub_panel.cc +++ b/src/wx/content_sub_panel.cc @@ -30,6 +30,9 @@ using std::list; using std::string; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif ContentSubPanel::ContentSubPanel (ContentPanel* p, wxString name) : wxScrolledWindow (p->notebook(), wxID_ANY) diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h index c4ae4d591..872784888 100644 --- a/src/wx/content_widget.h +++ b/src/wx/content_widget.h @@ -105,7 +105,11 @@ public: update_from_model (); for (typename List::iterator i = _content.begin(); i != _content.end(); ++i) { +#if BOOST_VERSION >= 106100 + _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, boost::placeholders::_1, boost::placeholders::_3))); +#else _connections.push_back ((*i)->Change.connect (boost::bind (&ContentWidget::model_changed, this, _1, _3))); +#endif } } diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc index 3defe75e4..9f868f9f4 100644 --- a/src/wx/dcp_panel.cc +++ b/src/wx/dcp_panel.cc @@ -58,6 +58,9 @@ using std::max; using std::make_pair; using boost::lexical_cast; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film) diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index b047f6468..e9818e0c1 100644 --- a/src/wx/dolby_doremi_certificate_panel.cc +++ b/src/wx/dolby_doremi_certificate_panel.cc @@ -36,6 +36,9 @@ using std::cout; using std::list; using boost::function; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::raw_convert; DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog) diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h index a7c1a6102..ef8862b3a 100644 --- a/src/wx/editable_list.h +++ b/src/wx/editable_list.h @@ -92,7 +92,11 @@ public: _list->Bind (wxEVT_COMMAND_LIST_ITEM_SELECTED, boost::bind (&EditableList::selection_changed, this)); _list->Bind (wxEVT_COMMAND_LIST_ITEM_DESELECTED, boost::bind (&EditableList::selection_changed, this)); +#if BOOST_VERSION >= 106100 + _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, boost::placeholders::_1)); +#else _list->Bind (wxEVT_SIZE, boost::bind (&EditableList::resized, this, _1)); +#endif refresh (); selection_changed (); diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index a017175f5..18aedc6de 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -41,6 +41,9 @@ using std::list; using boost::shared_ptr; using boost::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer) : wxPanel (parent) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index f68b21309..428b5c4fa 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -67,6 +67,9 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::weak_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::Size; static diff --git a/src/wx/focus_manager.cc b/src/wx/focus_manager.cc index f4f23cb28..616956951 100644 --- a/src/wx/focus_manager.cc +++ b/src/wx/focus_manager.cc @@ -21,6 +21,10 @@ #include "focus_manager.h" #include <wx/textctrl.h> +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + FocusManager* FocusManager::_instance; FocusManager * diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index e6147c3ea..a9db14c0f 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -70,6 +70,9 @@ using boost::bind; using boost::shared_ptr; using boost::function; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; class FullGeneralPage : public GeneralPage diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc index 2d47b427e..8897ec84c 100644 --- a/src/wx/gdc_certificate_panel.cc +++ b/src/wx/gdc_certificate_panel.cc @@ -27,6 +27,9 @@ using std::string; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif GDCCertificatePanel::GDCCertificatePanel (DownloadCertificateDialog* dialog) : DownloadCertificatePanel (dialog) diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc index f8d03626f..545d2330e 100644 --- a/src/wx/hints_dialog.cc +++ b/src/wx/hints_dialog.cc @@ -36,6 +36,9 @@ using boost::shared_ptr; using boost::optional; using boost::bind; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok) : wxDialog (parent, wxID_ANY, _("Hints")) diff --git a/src/wx/html_dialog.cc b/src/wx/html_dialog.cc index b5f86e7a1..718d546c3 100644 --- a/src/wx/html_dialog.cc +++ b/src/wx/html_dialog.cc @@ -26,6 +26,10 @@ #include <wx/fs_mem.h> #include <iostream> +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + HTMLDialog::HTMLDialog (wxWindow* parent, wxString title, wxString html) : wxDialog (parent, wxID_ANY, title) { diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 42d5f9dbe..a0430ca81 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -42,6 +42,9 @@ using std::cout; using boost::shared_ptr; using boost::weak_ptr; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif /** @param parent Parent window. * @param batch true to use BatchJobView, false to use NormalJobView. diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 920f54a3e..6d3b7355a 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -51,6 +51,9 @@ using std::make_pair; using std::runtime_error; using boost::shared_ptr; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif KDMDialog::KDMDialog (wxWindow* parent, shared_ptr<const Film> film) : wxDialog (parent, wxID_ANY, _("Make KDMs")) diff --git a/src/wx/nag_dialog.cc b/src/wx/nag_dialog.cc index abe460869..a4c881039 100644 --- a/src/wx/nag_dialog.cc +++ b/src/wx/nag_dialog.cc @@ -25,6 +25,9 @@ #include <boost/foreach.hpp> using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif NagDialog::NagDialog (wxWindow* parent, Config::Nag nag, wxString message, bool can_cancel) : wxDialog (parent, wxID_ANY, _("Important notice")) diff --git a/src/wx/recreate_chain_dialog.cc b/src/wx/recreate_chain_dialog.cc index 1dd14e0c8..935016939 100644 --- a/src/wx/recreate_chain_dialog.cc +++ b/src/wx/recreate_chain_dialog.cc @@ -28,6 +28,9 @@ using std::list; using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif RecreateChainDialog::RecreateChainDialog (wxWindow* parent) : QuestionDialog (parent, _("Certificate chain"), _("Recreate signing certificates"), _("Do nothing")) diff --git a/src/wx/save_template_dialog.cc b/src/wx/save_template_dialog.cc index 691d37a1a..044006350 100644 --- a/src/wx/save_template_dialog.cc +++ b/src/wx/save_template_dialog.cc @@ -24,6 +24,9 @@ #include <boost/foreach.hpp> using std::string; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif SaveTemplateDialog::SaveTemplateDialog (wxWindow* parent) : TableDialog (parent, _("Save template"), 2, 1, true) diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc index 6bfc0da4c..8cb31baec 100644 --- a/src/wx/screen_dialog.cc +++ b/src/wx/screen_dialog.cc @@ -38,6 +38,9 @@ using std::cout; using std::vector; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static string column (TrustedDevice d) diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index ad4c03850..45498c464 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -40,6 +40,9 @@ using boost::shared_ptr; using boost::bind; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif int const SubtitleAppearanceDialog::NONE = 0; int const SubtitleAppearanceDialog::OUTLINE = 1; diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc index 4ddd3ad92..53eb2e422 100644 --- a/src/wx/templates_dialog.cc +++ b/src/wx/templates_dialog.cc @@ -28,6 +28,9 @@ using std::string; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TemplatesDialog::TemplatesDialog (wxWindow* parent) : wxDialog (parent, wxID_ANY, _("Templates")) diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc index 9b591b191..1218fdb9e 100644 --- a/src/wx/text_view.cc +++ b/src/wx/text_view.cc @@ -35,6 +35,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::bind; using boost::dynamic_pointer_cast; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TextView::TextView ( wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index de5f05ae7..0bb7502e9 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -54,6 +54,9 @@ using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif /* 3 hours in 640 pixels */ double const Timeline::_minimum_pixels_per_second = 640.0 / (60 * 60 * 3); diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index a55526c88..7304c0e2a 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -27,6 +27,9 @@ using std::list; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr<Content> c) : TimelineView (tl) diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc index 3af86b707..6fb195f86 100644 --- a/src/wx/timeline_dialog.cc +++ b/src/wx/timeline_dialog.cc @@ -33,6 +33,9 @@ using std::list; using std::cout; using std::string; using boost::shared_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film) : wxDialog ( diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index f2fd65930..0b1b9771b 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -51,6 +51,9 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> viewer) diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc index f74157faf..713ef9d2c 100644 --- a/src/wx/video_panel.cc +++ b/src/wx/video_panel.cc @@ -53,6 +53,9 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using boost::bind; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif static VideoContentScale index_to_scale (int n) |