diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h index 14265e7983..f5d08060b8 100644 --- a/include/wx/msw/textctrl.h +++ b/include/wx/msw/textctrl.h @@ -184,8 +184,6 @@ protected: // common part of all ctors void Init(); - virtual bool DoLoadFile(const wxString& file, int fileType); - // creates the control of appropriate class (plain or rich edit) with the // styles corresponding to m_windowStyle // @@ -203,13 +201,6 @@ protected: // the limit is due to a previous call to SetMaxLength() and not built in) bool HasSpaceLimit(unsigned int *len) const; - // call this to increase the size limit (will do nothing if the current - // limit is big enough) - // - // returns true if we increased the limit to allow entering more text, - // false if we hit the limit set by SetMaxLength() and so didn't change it - bool AdjustSpaceLimit(); - #if wxUSE_RICHEDIT && (!wxUSE_UNICODE || wxUSE_UNICODE_MSLU) // replace the selection or the entire control contents with the given text // in the specified encoding @@ -274,6 +265,13 @@ private: void OnKeyDown(wxKeyEvent& event); + // call this to increase the size limit (will do nothing if the current + // limit is big enough) + // + // returns true if we increased the limit to allow entering more text, + // false if we hit the limit set by SetMaxLength() and so didn't change it + bool AdjustSpaceLimit(); + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 8e2a25a633..207b825c40 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1379,23 +1379,6 @@ void wxTextCtrl::DoSetSelection(long from, long to, int flags) } } -// ---------------------------------------------------------------------------- -// Working with files -// ---------------------------------------------------------------------------- - -bool wxTextCtrl::DoLoadFile(const wxString& file, int fileType) -{ - if ( wxTextCtrlBase::DoLoadFile(file, fileType) ) - { - // update the size limit if needed - AdjustSpaceLimit(); - - return true; - } - - return false; -} - // ---------------------------------------------------------------------------- // dirty status // ----------------------------------------------------------------------------