fix wxTextCtrl::operator<<('\n') in Unicode build (should use char overload, not...

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 5ace5a3d1936c8ab164ad29cd148526d478cecfe..952862d44ed4a4942b27979d9ff7f0ec9b08dd15 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -615,9 +615,10 @@ public:
     wxTextCtrl& operator<<(const wxString& s);
     wxTextCtrl& operator<<(int i);
     wxTextCtrl& operator<<(long i);
     wxTextCtrl& operator<<(const wxString& s);
     wxTextCtrl& operator<<(int i);
     wxTextCtrl& operator<<(long i);

-    wxTextCtrl& operator<<(float f);
+    wxTextCtrl& operator<<(float f) { return *this << double(f); }

     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(double d);

-    wxTextCtrl& operator<<(const wxChar c);
+    wxTextCtrl& operator<<(char c) { return *this << wxString(c); }
+    wxTextCtrl& operator<<(wchar_t c) { return *this << wxString(c); }

 
     // insert the character which would have resulted from this key event,
     // return true if anything has been inserted
 
     // insert the character which would have resulted from this key event,
     // return true if anything has been inserted

diff --git a/interface/textctrl.h b/interface/textctrl.h
index 1b5ff11567cd6c1afc1bed789c5921834c1fac79..b91d166a11ea7b4d14f3ea83402dc8cfcd0b8fa3 100644 (file)
--- a/interface/textctrl.h
+++ b/interface/textctrl.h
@@ -1319,14 +1319,15 @@ public:
 
     //@{
     /**
 
     //@{
     /**

-        Operator definitions for appending to a text control, for example:
-    */
-    wxTextCtrl operator(const wxString& s);
-    wxTextCtrl operator(int i);
-    wxTextCtrl operator(long i);
-    wxTextCtrl operator(float f);
-    wxTextCtrl operator(double d);
-    wxTextCtrl operator(char c);
+        Operator definitions for appending to a text control.
+    */
+    wxTextCtrl& operator<<(const wxString& s);
+    wxTextCtrl& operator<<(int i);
+    wxTextCtrl& operator<<(long i);
+    wxTextCtrl& operator<<(float f);
+    wxTextCtrl& operator<<(double d);
+    wxTextCtrl& operator<<(char c);
+    wxTextCtrl& operator<<(wchar_t c);

     //@}
 };
 
     //@}
 };
 

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index c69ba3aea19ae1b29dfefeac3d2f926f058706ae..8bc1d2775432aef5908122e6b8a93a9a1547fe0a 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -772,41 +772,19 @@ wxTextCtrl& wxTextCtrlBase::operator<<(const wxString& s)
     return *TEXTCTRL(this);
 }
 
     return *TEXTCTRL(this);
 }
 

-wxTextCtrl& wxTextCtrlBase::operator<<(float f)
-{
-    wxString str;
-    str.Printf(wxT("%.2f"), f);
-    AppendText(str);
-    return *TEXTCTRL(this);
-}
-

 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {
 wxTextCtrl& wxTextCtrlBase::operator<<(double d)
 {

-    wxString str;
-    str.Printf(wxT("%.2f"), d);
-    AppendText(str);
-    return *TEXTCTRL(this);
+    return *this << wxString::Format("%.2f", d);

 }
 
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {
 }
 
 wxTextCtrl& wxTextCtrlBase::operator<<(int i)
 {

-    wxString str;
-    str.Printf(wxT("%d"), i);
-    AppendText(str);
-    return *TEXTCTRL(this);
-}
-
-wxTextCtrl& wxTextCtrlBase::operator<<(long i)
-{
-    wxString str;
-    str.Printf(wxT("%ld"), i);
-    AppendText(str);
-    return *TEXTCTRL(this);
+    return *this << wxString::Format("%d", i);

 }
 
 }
 

-wxTextCtrl& wxTextCtrlBase::operator<<(const wxChar c)
+wxTextCtrl& wxTextCtrlBase::operator<<(long l)

 {
 {

-    return operator<<(wxString(c));
+    return *this << wxString::Format("%ld", l);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------