projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
fonts_dialog.h
diff --git
a/src/wx/fonts_dialog.h
b/src/wx/fonts_dialog.h
index 260e74c3dcd58715f79e1b8f762446fdf1a4e773..0ef3658cfd7f572f32fc0bc96398bbd64b8cd739 100644
(file)
--- a/
src/wx/fonts_dialog.h
+++ b/
src/wx/fonts_dialog.h
@@
-23,8
+23,6
@@
DCPOMATIC_DISABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
#include <wx/listctrl.h>
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/filesystem.hpp>
class Content;
#include <boost/filesystem.hpp>
class Content;
@@
-33,7
+31,7
@@
class TextContent;
class FontsDialog : public wxDialog
{
public:
class FontsDialog : public wxDialog
{
public:
- FontsDialog (wxWindow* parent,
boost::shared_ptr<Content>, boost
::shared_ptr<TextContent> caption);
+ FontsDialog (wxWindow* parent,
std::shared_ptr<Content>, std
::shared_ptr<TextContent> caption);
private:
void setup ();
private:
void setup ();
@@
-41,8
+39,8
@@
private:
void selection_changed ();
void edit_clicked ();
void selection_changed ();
void edit_clicked ();
-
boost
::weak_ptr<Content> _content;
-
boost
::weak_ptr<TextContent> _caption;
+
std
::weak_ptr<Content> _content;
+
std
::weak_ptr<TextContent> _caption;
wxListCtrl* _fonts;
wxButton* _edit;
};
wxListCtrl* _fonts;
wxButton* _edit;
};