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:
@@ -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
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -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
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user