X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd:/include/wx/univ/textctrl.h diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index a8a044e177..503fc259db 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -12,10 +12,6 @@ #ifndef _WX_UNIV_TEXTCTRL_H_ #define _WX_UNIV_TEXTCTRL_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univtextctrl.h" -#endif - class WXDLLEXPORT wxCaret; class WXDLLEXPORT wxTextCtrlCommandProcessor; @@ -70,13 +66,14 @@ class WXDLLEXPORT wxTextCtrlCommandProcessor; // wxTextCtrl // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, public wxScrollHelper +class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, + public wxScrollHelper { public: // creation // -------- - wxTextCtrl() { Init(); } + wxTextCtrl() : wxScrollHelper(this) { Init(); } wxTextCtrl(wxWindow *parent, wxWindowID id, @@ -86,6 +83,7 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr) + : wxScrollHelper(this) { Init(); @@ -519,6 +517,8 @@ private: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxTextCtrl) + + friend class wxWrappedLineData; }; // ----------------------------------------------------------------------------