projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use wx_ptr more.
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index de1123ccebe78c4e31d207ceed64a288ef373533..88686067221253ea674bf66ef611727cbc101706 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-109,6
+109,7
@@
private:
void later_clicked ();
void right_click (wxListEvent &);
void files_dropped (wxDropFilesEvent &);
void later_clicked ();
void right_click (wxListEvent &);
void files_dropped (wxDropFilesEvent &);
+ boost::optional<boost::filesystem::path> add_files_override_path() const;
void setup ();
void setup_sensitivity ();
void setup ();
void setup_sensitivity ();
@@
-132,7
+133,7
@@
private:
EnumIndexedVector<TextPanel*, TextType> _text_panel;
TimingPanel* _timing_panel;
ContentMenu* _menu;
EnumIndexedVector<TextPanel*, TextType> _text_panel;
TimingPanel* _timing_panel;
ContentMenu* _menu;
-
TimelineDialog* _timeline_dialog = nullptr
;
+
wx_ptr<TimelineDialog> _timeline_dialog
;
wxNotebook* _parent;
wxWindow* _last_selected_tab = nullptr;
wxNotebook* _parent;
wxWindow* _last_selected_tab = nullptr;