projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give markers dialog a close button (#2070).
[dcpomatic.git]
/
src
/
wx
/
markers_dialog.h
diff --git
a/src/wx/markers_dialog.h
b/src/wx/markers_dialog.h
index e2c261873959074522a02a6356794beb0495388c..7d713bd59fbf4f60ff723c1399de7b333b7877c7 100644
(file)
--- a/
src/wx/markers_dialog.h
+++ b/
src/wx/markers_dialog.h
@@
-18,13
+18,14
@@
*/
*/
+
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
#include "lib/warnings.h"
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <list>
#include <list>
+#include <memory>
+
class Marker;
class Film;
class Marker;
class Film;
@@
-33,9
+34,9
@@
class FilmViewer;
class MarkersDialog : public wxDialog
{
public:
class MarkersDialog : public wxDialog
{
public:
- MarkersDialog (wxWindow* parent,
boost::weak_ptr<Film> film, boost
::weak_ptr<FilmViewer> viewer);
+ MarkersDialog (wxWindow* parent,
std::weak_ptr<Film> film, std
::weak_ptr<FilmViewer> viewer);
private:
private:
- std::list<
boost::shared_ptr<Marker>
> _markers;
-
boost
::weak_ptr<Film> _film;
+ std::list<
std::shared_ptr<Marker>
> _markers;
+
std
::weak_ptr<Film> _film;
};
};