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
This commit is contained in:
@@ -66,13 +66,14 @@ class WXDLLEXPORT wxTextCtrlCommandProcessor;
|
|||||||
// wxTextCtrl
|
// wxTextCtrl
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase, public wxScrollHelper
|
class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase,
|
||||||
|
public wxScrollHelper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
// creation
|
// creation
|
||||||
// --------
|
// --------
|
||||||
|
|
||||||
wxTextCtrl() { Init(); }
|
wxTextCtrl() : wxScrollHelper(this) { Init(); }
|
||||||
|
|
||||||
wxTextCtrl(wxWindow *parent,
|
wxTextCtrl(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
@@ -82,6 +83,7 @@ public:
|
|||||||
long style = 0,
|
long style = 0,
|
||||||
const wxValidator& validator = wxDefaultValidator,
|
const wxValidator& validator = wxDefaultValidator,
|
||||||
const wxString& name = wxTextCtrlNameStr)
|
const wxString& name = wxTextCtrlNameStr)
|
||||||
|
: wxScrollHelper(this)
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
|
|
||||||
|
@@ -635,9 +635,6 @@ void wxTextCtrl::Init()
|
|||||||
m_heightLine =
|
m_heightLine =
|
||||||
m_widthAvg = -1;
|
m_widthAvg = -1;
|
||||||
|
|
||||||
// init wxScrollHelper
|
|
||||||
SetWindow(this);
|
|
||||||
|
|
||||||
// init the undo manager
|
// init the undo manager
|
||||||
m_cmdProcessor = new wxTextCtrlCommandProcessor(this);
|
m_cmdProcessor = new wxTextCtrlCommandProcessor(this);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user