wx_USEIOSTREAMH changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (UG)
1998-10-16 09:56:38 +00:00
parent 5f31d8628c
commit 7cf98a658a
2 changed files with 15 additions and 2 deletions

View File

@@ -524,7 +524,11 @@ wxFindMenuItemId (wxFrame * frame, const wxString& menuString, const wxString& i
wxDebugStreamBuf::wxDebugStreamBuf(void) wxDebugStreamBuf::wxDebugStreamBuf(void)
{ {
if (allocate()) setp(base(),ebuf()); // <iostream> 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)) int wxDebugStreamBuf::overflow(int WXUNUSED(i))

View File

@@ -745,11 +745,15 @@ void wxTextCtrl::OnDropFiles(wxDropFilesEvent& event)
int wxTextCtrl::overflow(int c) int wxTextCtrl::overflow(int c)
{ {
// Make sure there is a holding area // Make sure there is a holding area
// this is not needed in <iostream> usage as it automagically allocates
// it, but does someone want to emulate it for safety's sake?
#if wxUSE_IOSTREAMH
if ( allocate()==EOF ) if ( allocate()==EOF )
{ {
wxError("Streambuf allocation failed","Internal error"); wxError("Streambuf allocation failed","Internal error");
return EOF; return EOF;
} }
#endif
// Verify that there are no characters in get area // Verify that there are no characters in get area
if ( gptr() && gptr() < egptr() ) 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 */ /* This doesn't seem to be fatal so comment out error message */
// wxError("Put area not opened","Internal error"); // 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 // Determine how many characters have been inserted but no consumed