projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some missing override labels.
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index 2a74df215fcbdf03588e5e8f5590be04068e0ad6..650b7966838abc828d9c99a54e0a8ac872c1b474 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-48,7
+48,7
@@
class LimitedSplitter : public wxSplitterWindow
public:
LimitedSplitter (wxWindow* parent);
public:
LimitedSplitter (wxWindow* parent);
- bool OnSashPositionChange (int new_position)
+ bool OnSashPositionChange (int new_position)
override
{
/* Try to stop the top bit of the splitter getting so small that buttons disappear */
return new_position > 220;
{
/* Try to stop the top bit of the splitter getting so small that buttons disappear */
return new_position > 220;
@@
-64,11
+64,14
@@
private:
};
};
-class ContentPanel
: public boost::noncopyable
+class ContentPanel
{
public:
ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
{
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;
}
std::shared_ptr<Film> film () const {
return _film;
}
@@
-123,7
+126,7
@@
private:
void setup ();
void setup_sensitivity ();
void setup ();
void setup_sensitivity ();
- void add_files (std::
list
<boost::filesystem::path>);
+ void add_files (std::
vector
<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;