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
This commit is contained in:
Sylvain Bougnoux
2000-02-17 18:23:41 +00:00
parent b51b78a9c7
commit fa40e7a175
2 changed files with 26 additions and 11 deletions

View File

@@ -64,6 +64,7 @@ public:
// -------- // --------
wxTextCtrlBase(); wxTextCtrlBase();
~wxTextCtrlBase();
// accessors // accessors
// --------- // ---------
@@ -159,6 +160,13 @@ protected:
// the name of the last file loaded with LoadFile() which will be used by // the name of the last file loaded with LoadFile() which will be used by
// SaveFile() by default // SaveFile() by default
wxString m_filename; wxString m_filename;
private:
#ifndef NO_TEXT_WINDOW_STREAM
#if !wxUSE_IOSTREAMH
char *m_streambuf;
#endif
#endif
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -48,18 +48,25 @@
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
wxTextCtrlBase::wxTextCtrlBase() 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
#ifndef NO_TEXT_WINDOW_STREAM #if wxUSE_IOSTREAMH
if (allocate()) if (allocate())
setp(base(),ebuf()); setp(base(),ebuf());
#endif // NO_TEXT_WINDOW_STREAM #else
#endif //wxUSE_IOSTREAMH 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
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------