projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
content_menu.h
diff --git
a/src/wx/content_menu.h
b/src/wx/content_menu.h
index a9f9093c6ab5bb3c94d48244480bc1859495bbf2..f2ad3aa75621ac04a114b46badd931b6bd92a4b1 100644
(file)
--- a/
src/wx/content_menu.h
+++ b/
src/wx/content_menu.h
@@
-30,9
+30,9
@@
class Film;
class ContentMenu
{
public:
- ContentMenu (wxWindow
*
);
+ ContentMenu (wxWindow
* p
);
~ContentMenu ();
-
+
void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
private: