std::shared_ptr

[dcpomatic.git] / src / wx / text_panel.h

diff --git a/src/wx/text_panel.h b/src/wx/text_panel.h
index 7a7b7b504b3b95d41d3bb3621254adf9159064ce..f35f39cbe340774aebe7aa0dd83439059ab74467 100644 (file)
--- a/src/wx/text_panel.h
+++ b/src/wx/text_panel.h
@@ -45,7 +45,6 @@ private:
        void y_scale_changed ();
        void line_spacing_changed ();
        void dcp_track_changed ();
-       void language_changed ();
        void stream_changed ();
        void text_view_clicked ();
        void fonts_dialog_clicked ();
@@ -90,8 +89,6 @@ private:
        wxSpinCtrl* _line_spacing;
        wxStaticText* _dcp_track_label;
        wxChoice* _dcp_track;
-       wxStaticText* _language_label;
-       wxTextCtrl* _language;
        wxStaticText* _stream_label;
        wxChoice* _stream;
        wxButton* _text_view_button;
@@ -102,10 +99,10 @@ private:
        TextType _original_type;
 
        int _outline_subtitles_row;
-       int _language_row;
+       int _ccap_track_row;
 
-       boost::weak_ptr<Content> _analysis_content;
+       std::weak_ptr<Content> _analysis_content;
        boost::signals2::scoped_connection _analysis_finished_connection;
-       boost::shared_ptr<SubtitleAnalysis> _analysis;
+       std::shared_ptr<SubtitleAnalysis> _analysis;
        bool _loading_analysis;
 };