X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7146cbec5ae3c75cbf3e259ca1697efec7d9e52..fbf618dff87a9e4a88d5be458cecc50309b30af3:/include/wx/string.h?ds=sidebyside

diff --git a/include/wx/string.h b/include/wx/string.h
index dcf8f9058d..844cfa9f81 100644
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -187,6 +187,7 @@ inline int Stricmp(const char *psz1, const char *psz2)
     // we don't need an extra ctor from std::string when copy ctor already does
     // the work
     #undef wxUSE_STD_STRING
+    #define wxUSE_STD_STRING 0
 
     #if (defined(__GNUG__) && (__GNUG__ < 3)) || \
         (defined(_MSC_VER) && (_MSC_VER <= 1200))
@@ -954,6 +955,14 @@ public:
       // insert an unsigned long into string
   wxString& operator<<(unsigned long ul)
     { return (*this) << Format(_T("%lu"), ul); }
+#if defined wxLongLong_t && !defined wxLongLongIsLong
+      // insert a long long if they exist and aren't longs
+  wxString& operator<<(wxLongLong_t ll)
+    { return (*this) << Format(_T("%") wxLongLongFmtSpec _T("d"), ll); }
+      // insert an unsigned long long
+  wxString& operator<<(wxULongLong_t ull)
+    { return (*this) << Format(_T("%") wxLongLongFmtSpec _T("u"), ull); }
+#endif
       // insert a float into string
   wxString& operator<<(float f)
     { return (*this) << Format(_T("%f"), f); }