projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add lock to _colours since it can be manipulated by a Job thread.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index ecbb4a3504e2e7a27e80e0c2c5777d48a945e594..a38109b0738e84914139a38ca0350c47b6c54604 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-34,7
+34,7
@@
class DCPContent;
class ContentMenu : public boost::noncopyable
{
public:
class ContentMenu : public boost::noncopyable
{
public:
- ContentMenu (wxWindow* p);
+
explicit
ContentMenu (wxWindow* p);
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
@@
-55,6
+55,7
@@
private:
/** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
/** Film that we are working with; set up by popup() */
boost::weak_ptr<Film> _film;
wxWindow* _parent;
+ bool _pop_up_open;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;
ContentList _content;
TimelineContentViewList _views;
wxMenuItem* _repeat;