From 4e4968464eeef1956cb82392e1fc3b27a792ab89 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 14 Jan 2023 22:06:05 +0100 Subject: Add wx_ptr and use it instead of ScopeGuard in a lot of places. --- src/wx/content_advanced_dialog.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/wx/content_advanced_dialog.cc') diff --git a/src/wx/content_advanced_dialog.cc b/src/wx/content_advanced_dialog.cc index 35343d78d..752fa565a 100644 --- a/src/wx/content_advanced_dialog.cc +++ b/src/wx/content_advanced_dialog.cc @@ -25,13 +25,13 @@ #include "filter_dialog.h" #include "language_tag_widget.h" #include "static_text.h" +#include "wx_ptr.h" #include "wx_util.h" #include "lib/content.h" #include "lib/dcp_content.h" #include "lib/filter.h" #include "lib/ffmpeg_content.h" #include "lib/image_content.h" -#include "lib/scope_guard.h" #include "lib/video_content.h" #include LIBDCP_DISABLE_WARNINGS @@ -181,9 +181,7 @@ ContentAdvancedDialog::edit_filters () return; } - auto dialog = new FilterDialog(this, _filters_list); - ScopeGuard sg = [dialog]() { dialog->Destroy(); }; - + auto dialog = make_wx(this, _filters_list); dialog->ActiveChanged.connect(bind(&ContentAdvancedDialog::filters_changed, this, _1)); dialog->ShowModal(); } -- cgit v1.2.3