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:
parent
5d4a10e70a
commit
c3ee2228e5
@ -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();
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user