X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d56eb5c56fb1f5707727e86a615e270d4dddbfe..72594e90b2da8c167ba63b89b2c168c57a19cab4:/include/wx/longlong.h?ds=inline

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 0945d472cb..cc2278a565 100644
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -18,7 +18,7 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/wxchar.h"
+#include "wx/string.h"
 
 #include <limits.h>     // for LONG_MAX
 
@@ -45,6 +45,9 @@
 // NB: we #define and not typedef wxLongLong_t because we want to be able to
 //     use 'unsigned wxLongLong_t' as well and because we use "#ifdef
 //     wxLongLong_t" below
+
+// first check for generic cases which are long on 64bit machine and "long
+// long", then check for specific compilers
 #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
     #define wxLongLong_t long
     #define wxLongLongIsLong
@@ -52,7 +55,9 @@
     #define wxLongLong_t __int64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
-#elif defined(__GNUG__) || defined(__sgi)
+#elif defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8
+    #define wxLongLong_t long long
+#elif defined(__MINGW32__)
     #define wxLongLong_t long long
 #elif defined(__MWERKS__)
     #if __option(longlong)
@@ -74,6 +79,7 @@
                     "Please report your compiler version to " \
                     "wx-dev@lists.wxwindows.org!"
 #endif
+
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler
 
@@ -88,7 +94,12 @@
     #endif
 
     class WXDLLEXPORT wxLongLongWx;
+#if defined(__VISUALC__) && !defined(__WIN32__)
+    #define wxLongLong wxLongLongWx
+#else
     typedef wxLongLongWx wxLongLong;
+#endif
+
 #else
     // if nothing is defined, use native implementation by default, of course
     #ifndef wxUSE_LONGLONG_NATIVE
@@ -198,6 +209,7 @@ public:
         // negation operator
     wxLongLongNative operator-() const
         { return wxLongLongNative(-m_ll); }
+    wxLongLongNative& Negate() { m_ll = -m_ll; return *this; }
 
         // subtraction
     wxLongLongNative operator-(const wxLongLongNative& ll) const
@@ -298,12 +310,16 @@ public:
         { return m_ll >= l; }
 
     // miscellaneous
+
+        // return the string representation of this number
+    wxString ToString() const;
+
         // conversion to byte array: returns a pointer to static buffer!
     void *asArray() const;
 
 #if wxUSE_STD_IOSTREAM
         // input/output
-    friend ostream& operator<<(ostream&, const wxLongLongNative&);
+    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongNative&);
 #endif
 
 private:
@@ -484,12 +500,16 @@ public:
                 wxLongLongWx& remainder) const;
 
     // input/output
-#if wxUSE_STD_IOSTREAM
-    friend ostream& operator<<(ostream&, const wxLongLongWx&);
-#endif // wxUSE_STD_IOSTREAM
+
+    // return the string representation of this number
+    wxString ToString() const;
 
     void *asArray() const;
 
+#if wxUSE_STD_IOSTREAM
+    friend wxSTD ostream& operator<<(wxSTD ostream&, const wxLongLongWx&);
+#endif // wxUSE_STD_IOSTREAM
+
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs