From c3ee2228e59be9a48ba2029d87c2442c698b71aa Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 18 Oct 2005 00:03:36 +0000 Subject: [PATCH] compilation fix after wxScrollHelper changes (ctor argument is now not optional and SetWin doesn't exist any more) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/univ/textctrl.h | 6 ++++-- src/univ/textctrl.cpp | 3 --- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h index 1c513e8b40..503fc259db 100644 --- a/include/wx/univ/textctrl.h +++ b/include/wx/univ/textctrl.h @@ -66,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, @@ -82,6 +83,7 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr) + : wxScrollHelper(this) { Init(); diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp index 0a4a839765..92553baa44 100644 --- a/src/univ/textctrl.cpp +++ b/src/univ/textctrl.cpp @@ -635,9 +635,6 @@ void wxTextCtrl::Init() m_heightLine = m_widthAvg = -1; - // init wxScrollHelper - SetWindow(this); - // init the undo manager m_cmdProcessor = new wxTextCtrlCommandProcessor(this); -- 2.45.2