X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf3e0fbd1ff071caa5d929f01ad6ef9a64ee6494..cd9da200285e3c625be91768c9ca61dc218c94d0:/src/common/textcmn.cpp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 63408d24d4..d1c0434cc2 100644
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -48,11 +48,18 @@
 // ----------------------------------------------------------------------------
 
 wxTextCtrlBase::wxTextCtrlBase()
+#if !wxUSE_IOSTREAMH
+    #ifndef NO_TEXT_WINDOW_STREAM
+        :streambuf()
+    #endif //NO_TEXT_WINDOW_STREAM
+#endif //!wxUSE_IOSTREAMH
 {
-#ifndef NO_TEXT_WINDOW_STREAM
-    if (allocate())
-        setp(base(),ebuf());
-#endif // NO_TEXT_WINDOW_STREAM
+#if wxUSE_IOSTREAMH
+    #ifndef NO_TEXT_WINDOW_STREAM
+        if (allocate())
+            setp(base(),ebuf());
+    #endif // NO_TEXT_WINDOW_STREAM
+#endif //wxUSE_IOSTREAMH
 }
 
 // ----------------------------------------------------------------------------
@@ -88,7 +95,7 @@ bool wxTextCtrlBase::SaveFile(const wxString& filename)
     if ( !filenameToUse )
     {
         // what kind of message to give? is it an error or a program bug?
-        wxLogDebug(_T("Can't save textctrl to file without filename."));
+        wxLogDebug(wxT("Can't save textctrl to file without filename."));
 
         return FALSE;
     }
@@ -122,7 +129,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
 wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 {
     wxString str;
-    str.Printf(_T("%.2f"), f);
+    str.Printf(wxT("%.2f"), f);
     AppendText(str);
     return *TEXTCTRL(this);
 }
@@ -130,7 +137,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(float f)
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
     wxString str;
-    str.Printf(_T("%.2f"), d);
+    str.Printf(wxT("%.2f"), d);
     AppendText(str);
     return *TEXTCTRL(this);
 }
@@ -138,7 +145,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
     wxString str;
-    str.Printf(_T("%d"), i);
+    str.Printf(wxT("%d"), i);
     AppendText(str);
     return *TEXTCTRL(this);
 }
@@ -146,7 +153,7 @@ wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 wxTextCtrl& wxTextCtrlBase::operator<<(long i)
 {
     wxString str;
-    str.Printf(_T("%ld"), i);
+    str.Printf(wxT("%ld"), i);
     AppendText(str);
     return *TEXTCTRL(this);
 }