From: Sylvain Bougnoux Date: Thu, 17 Feb 2000 18:23:41 +0000 (+0000) Subject: Workaround (?) for using streambuf with wxUSE_IOSTREAMH=0 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/fa40e7a17559c9328be4e0202c9c87dc7adb562e Workaround (?) for using streambuf with wxUSE_IOSTREAMH=0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h index 223403b1c8..02434c3377 100644 --- a/include/wx/textctrl.h +++ b/include/wx/textctrl.h @@ -64,6 +64,7 @@ public: // -------- wxTextCtrlBase(); + ~wxTextCtrlBase(); // accessors // --------- @@ -159,6 +160,13 @@ protected: // the name of the last file loaded with LoadFile() which will be used by // SaveFile() by default wxString m_filename; + +private: +#ifndef NO_TEXT_WINDOW_STREAM +#if !wxUSE_IOSTREAMH + char *m_streambuf; +#endif +#endif }; // ---------------------------------------------------------------------------- diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp index d1c0434cc2..0ce243a141 100644 --- a/src/common/textcmn.cpp +++ b/src/common/textcmn.cpp @@ -48,18 +48,25 @@ // ---------------------------------------------------------------------------- wxTextCtrlBase::wxTextCtrlBase() -#if !wxUSE_IOSTREAMH - #ifndef NO_TEXT_WINDOW_STREAM - :streambuf() - #endif //NO_TEXT_WINDOW_STREAM -#endif //!wxUSE_IOSTREAMH { -#if wxUSE_IOSTREAMH - #ifndef NO_TEXT_WINDOW_STREAM - if (allocate()) - setp(base(),ebuf()); - #endif // NO_TEXT_WINDOW_STREAM -#endif //wxUSE_IOSTREAMH +#ifndef NO_TEXT_WINDOW_STREAM + #if wxUSE_IOSTREAMH + if (allocate()) + setp(base(),ebuf()); + #else + m_streambuf=new char[64]; + setp(m_streambuf,m_streambuf+64); + #endif //wxUSE_IOSTREAMH +#endif // NO_TEXT_WINDOW_STREAM +} + +wxTextCtrlBase::~wxTextCtrlBase() +{ +#ifndef NO_TEXT_WINDOW_STREAM +#if !wxUSE_IOSTREAMH + delete m_streambuf; +#endif +#endif } // ----------------------------------------------------------------------------