X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..07aaa1a4b853b64e61c01a9daf8a322d3896c36b:/src/os2/textctrl.cpp diff --git a/src/os2/textctrl.cpp b/src/os2/textctrl.cpp index c98efebc7d..91a81672f6 100644 --- a/src/os2/textctrl.cpp +++ b/src/os2/textctrl.cpp @@ -55,9 +55,9 @@ // event tables and other macros // ---------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl) +IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxTextCtrlBase) -BEGIN_EVENT_TABLE(wxTextCtrl, wxControl) +BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase) EVT_CHAR(wxTextCtrl::OnChar) EVT_DROP_FILES(wxTextCtrl::OnDropFiles) @@ -680,10 +680,11 @@ void wxTextCtrl::SetSelection( } // end of wxTextCtrl::SetSelection bool wxTextCtrl::LoadFile( - const wxString& rsFile + const wxString& rsFile, + int fileType ) { - if ( wxTextCtrlBase::LoadFile(rsFile) ) + if ( wxTextCtrlBase::DoLoadFile(rsFile, fileType) ) { // // Update the size limit if needed @@ -692,7 +693,7 @@ bool wxTextCtrl::LoadFile( return true; } return false; -} // end of wxTextCtrl::LoadFile +} // end of wxTextCtrl::DoLoadFile bool wxTextCtrl::IsModified() const {