diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-04-29 08:31:23 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-04-29 08:31:23 +0200 |
| commit | b249700e1da7dd6631a8b4440587f4093a2bdef1 (patch) | |
| tree | 71f88855e72b11f927d194f0676bac93845d26be /src/wx | |
| parent | 94695fc3214917ad7310af36270ce1e0b88cdfa3 (diff) | |
Remove use of boost::noncopyable.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.h | 5 | ||||
| -rw-r--r-- | src/wx/content_panel.h | 5 | ||||
| -rw-r--r-- | src/wx/job_view.h | 6 | ||||
| -rw-r--r-- | src/wx/language_tag_widget.h | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h index 7743d0712..8a3548419 100644 --- a/src/wx/content_menu.h +++ b/src/wx/content_menu.h @@ -30,11 +30,14 @@ class Film; class Job; class DCPContent; -class ContentMenu : public boost::noncopyable +class ContentMenu { public: explicit ContentMenu (wxWindow* p); + ContentMenu (ContentMenu const &) = delete; + ContentMenu& operator= (ContentMenu const &) = delete; + void popup (std::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint); private: diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 2a74df215..aca818118 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -64,11 +64,14 @@ private: }; -class ContentPanel : public boost::noncopyable +class ContentPanel { public: ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer); + ContentPanel (ContentPanel const&) = delete; + ContentPanel& operator= (ContentPanel const&) = delete; + std::shared_ptr<Film> film () const { return _film; } diff --git a/src/wx/job_view.h b/src/wx/job_view.h index 19f746b01..4a602fc62 100644 --- a/src/wx/job_view.h +++ b/src/wx/job_view.h @@ -21,7 +21,6 @@ #ifndef DCPOMATIC_JOB_VIEW_H #define DCPOMATIC_JOB_VIEW_H -#include <boost/noncopyable.hpp> #include <boost/signals2.hpp> class Job; @@ -36,12 +35,15 @@ class wxButton; class wxSizer; class wxCheckBox; -class JobView : public boost::noncopyable +class JobView { public: JobView (std::shared_ptr<Job> job, wxWindow* parent, wxWindow* container, wxFlexGridSizer* table); virtual ~JobView () {} + JobView (JobView const&) = delete; + JobView& operator= (JobView const&) = delete; + virtual int insert_position () const = 0; virtual void job_list_changed () {} diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h index c2fd63d92..16c00e3a6 100644 --- a/src/wx/language_tag_widget.h +++ b/src/wx/language_tag_widget.h @@ -21,7 +21,6 @@ #include <dcp/language_tag.h> #include <wx/wx.h> -#include <boost/noncopyable.hpp> #include <boost/signals2.hpp> @@ -31,12 +30,15 @@ class wxStaticText; class wxWindow; -class LanguageTagWidget : public boost::noncopyable +class LanguageTagWidget { public: LanguageTagWidget (wxWindow* parent, wxString tooltip, boost::optional<dcp::LanguageTag> tag, boost::optional<wxString> size_to_fit = boost::none); ~LanguageTagWidget (); + LanguageTagWidget (LanguageTagWidget const&) = delete; + LanguageTagWidget& operator= (LanguageTagWidget const&) = delete; + wxSizer* sizer () const { return _sizer; } |
