wx_USEIOSTREAMH changes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index b76359d8d9f97d427faa840f2f197600b88e1bdd..55fbb4463026c0079f1442e79afbcddcbf0326f3 100644 (file)
--- 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)
 {
  
 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))

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 65fe3eac812a85c4169ff3a67722793d00e98c2f..dc70319e757c3a7c804e0024ba155fa57e0d681a 100644 (file)
--- 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
 int wxTextCtrl::overflow(int c)
 {
   // 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 )
   {
     wxError("Streambuf allocation failed","Internal error");
     return EOF;
   }
   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() )
   
   // 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");
   {
 /* 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
   }
 
   // Determine how many characters have been inserted but no consumed