projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't show an error when cancelling subtitle analysis.
[dcpomatic.git]
/
src
/
wx
/
text_panel.h
diff --git
a/src/wx/text_panel.h
b/src/wx/text_panel.h
index dc8f685f134cff5dfcf823a4e468c347b6b3f563..eee5e916cb50248f9e48713d269fb77c70850101 100644
(file)
--- a/
src/wx/text_panel.h
+++ b/
src/wx/text_panel.h
@@
-20,6
+20,7
@@
#include "content_sub_panel.h"
#include "content_sub_panel.h"
+#include "wx_ptr.h"
class CheckBox;
class CheckBox;
@@
-62,7
+63,7
@@
private:
void update_dcp_track_selection ();
void add_to_grid () override;
void try_to_load_analysis ();
void update_dcp_track_selection ();
void add_to_grid () override;
void try_to_load_analysis ();
- void analysis_finished
(
);
+ void analysis_finished
(Job::Result result
);
void language_changed ();
void language_is_additional_changed ();
void language_changed ();
void language_is_additional_changed ();
@@
-100,9
+101,9
@@
private:
wxStaticText* _stream_label;
wxChoice* _stream;
wxButton* _text_view_button;
wxStaticText* _stream_label;
wxChoice* _stream;
wxButton* _text_view_button;
-
TextView* _text_view = nullptr
;
+
wx_ptr<TextView> _text_view
;
wxButton* _fonts_dialog_button;
wxButton* _fonts_dialog_button;
-
FontsDialog* _fonts_dialog = nullptr
;
+
wx_ptr<FontsDialog> _fonts_dialog
;
wxButton* _appearance_dialog_button;
TextType _original_type;
wxStaticText* _language_label = nullptr;
wxButton* _appearance_dialog_button;
TextType _original_type;
wxStaticText* _language_label = nullptr;