From 7cf98a658a11f0ea3fb723ea686a77b8adb39718 Mon Sep 17 00:00:00 2001 From: "Unknown (UG)" Date: Fri, 16 Oct 1998 09:56:38 +0000 Subject: [PATCH] wx_USEIOSTREAMH changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/utilscmn.cpp | 6 +++++- src/msw/textctrl.cpp | 11 ++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index b76359d8d9..55fbb44630 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -524,7 +524,11 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i wxDebugStreamBuf::wxDebugStreamBuf(void) { - if (allocate()) setp(base(),ebuf()); + // usage doesn't need this, and i have no idea how to simulate it. +#if wxUSE_IOSTREAMH + if (allocate()) + setp(base(),ebuf()); +#endif } int wxDebugStreamBuf::overflow(int WXUNUSED(i)) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 65fe3eac81..dc70319e75 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -745,11 +745,15 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event) int wxTextCtrl::overflow(int c) { // Make sure there is a holding area + // this is not needed in usage as it automagically allocates + // it, but does someone want to emulate it for safety's sake? +#if wxUSE_IOSTREAMH if ( allocate()==EOF ) { wxError("Streambuf allocation failed","Internal error"); return EOF; } +#endif // Verify that there are no characters in get area if ( gptr() && gptr() < egptr() ) @@ -766,7 +770,12 @@ int wxTextCtrl::overflow(int c) { /* This doesn't seem to be fatal so comment out error message */ // wxError("Put area not opened","Internal error"); - setp( base(), base() ); + +#if wxUSE_IOSTREAMH + setp( base(), base() ); +#else + setp( pbase(), pbase() ); +#endif } // Determine how many characters have been inserted but no consumed