compilation fix after wxScrollHelper changes (ctor argument is now not optional and...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/textctrl.h b/include/wx/univ/textctrl.h
index 1c513e8b40fbdcab1910e3348189f20419219c60..503fc259db89388d4528cd624a98bca9c75732f3 100644 (file)
--- a/include/wx/univ/textctrl.h
+++ b/include/wx/univ/textctrl.h
@@ -66,13 +66,14 @@ class WXDLLEXPORT wxTextCtrlCommandProcessor;
 // wxTextCtrl
 // ----------------------------------------------------------------------------
 
 // wxTextCtrl
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, public wxScrollHelper
+class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase,
+                               public wxScrollHelper

 {
 public:
     // creation
     // --------
 
 {
 public:
     // creation
     // --------
 

-    wxTextCtrl() { Init(); }
+    wxTextCtrl() : wxScrollHelper(this) { Init(); }

 
     wxTextCtrl(wxWindow *parent,
                wxWindowID id,
 
     wxTextCtrl(wxWindow *parent,
                wxWindowID id,


@@ -82,6 +83,7 @@ public:
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)
                long style = 0,
                const wxValidator& validator = wxDefaultValidator,
                const wxString& name = wxTextCtrlNameStr)

+        : wxScrollHelper(this) 

     {
         Init();
 
     {
         Init();
 

diff --git a/src/univ/textctrl.cpp b/src/univ/textctrl.cpp
index 0a4a8397659b7e938056224af31ea925a031ff1a..92553baa442592b9bd8d279aed189d6859bfbe74 100644 (file)
--- a/src/univ/textctrl.cpp
+++ b/src/univ/textctrl.cpp
@@ -635,9 +635,6 @@ void wxTextCtrl::Init()
     m_heightLine =
     m_widthAvg = -1;
 
     m_heightLine =
     m_widthAvg = -1;
 

-    // init wxScrollHelper
-    SetWindow(this);
-

     // init the undo manager
     m_cmdProcessor = new wxTextCtrlCommandProcessor(this);
 
     // init the undo manager
     m_cmdProcessor = new wxTextCtrlCommandProcessor(this);