diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-02-25 01:53:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-02-25 13:04:08 +0100 |
| commit | 6d3086dd78a35bdc179a6579e23f8b5816347dbf (patch) | |
| tree | a47facfec259302afd6e0e690b748ad9f655548e /src/wx/content_panel.h | |
| parent | 91c171b65e7329b90ac77442fd35b165bde70b26 (diff) | |
Fix misunderstanding of wxDialog lifetime handling.
Broken by d0308d53dd9f4d036d8c5fe8023920fcdfd43f39
wxDialog can be stack allocated if opened with ShowModal(), but not with
Show(). Go back to wx_ptr for those that are opened with Show().
Diffstat (limited to 'src/wx/content_panel.h')
| -rw-r--r-- | src/wx/content_panel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h index 18d740828..f99d518a2 100644 --- a/src/wx/content_panel.h +++ b/src/wx/content_panel.h @@ -20,7 +20,6 @@ #include "content_menu.h" -#include "content_timeline_dialog.h" #include "lib/enum_indexed_vector.h" #include "lib/film_property.h" #include "lib/text_type.h" @@ -134,7 +133,7 @@ private: EnumIndexedVector<TextPanel*, TextType> _text_panel; TimingPanel* _timing_panel; ContentMenu* _menu; - boost::optional<ContentTimelineDialog> _timeline_dialog; + wx_ptr<ContentTimelineDialog> _timeline_dialog; wxNotebook* _parent; wxWindow* _last_selected_tab = nullptr; |