wxLongLong to wxString operators.

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

include/wx/longlong.h

@@ -304,6 +304,8 @@ public:
     friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
 #endif
 
+    friend wxString& operator<<(wxString&, const wxLongLongNative&);
+
 private:
     wxLongLong_t  m_ll;
 };
@@ -487,6 +489,8 @@ public:
     friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongNative&);
 #endif
 
+    friend wxString& operator<<(wxString&, const wxULongLongNative&);
+
 private:
     unsigned wxLongLong_t  m_ll;
 };
@@ -679,6 +683,8 @@ public:
     friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
 #endif // wxUSE_STD_IOSTREAM
 
+    friend wxString& operator<<(wxString&, const wxLongLongWx&);
+
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 
@@ -861,6 +867,8 @@ public:
     friend wxSTD ostream& operator<<(wxSTD ostream&, const wxULongLongWx&);
 #endif // wxUSE_STD_IOSTREAM
 
+    friend wxString& operator<<(wxString&, const wxULongLongWx&);
+
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 

src/common/longlong.cpp

@@ -1162,4 +1162,14 @@ wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
 
 #endif // wxUSE_STD_IOSTREAM
 
+wxString& operator<< (wxString& s, const wxLongLong& ll)
+{
+    return s << ll.ToString();
+}
+
+wxString& operator<< (wxString& s, const wxULongLong& ll)
+{
+    return s << ll.ToString();
+}
+
 #endif // wxUSE_LONGLONG

tests/longlong/longlongtest.cpp

@@ -281,6 +281,10 @@ void LongLongTestCase::ToString()
         s2 = a.ToString();
         CPPUNIT_ASSERT( s1 == s2 );
 
+        s2 = wxEmptyString;
+        s2 << a;
+        CPPUNIT_ASSERT( s1 == s2 );
+
 #if wxUSE_LONGLONG_WX
         wxLongLongWx a1 = testLongs[n];
         s2 = a1.ToString();