simplified WXDLLEXPORT/IMPORT defines, added WXEXPORT/IMPORT

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 621abc3e3dd2f1c8799c7637732abe2fe903a0fe..07d8ca434281a2d72b760f42b3e649faddadb456 100644 (file)
--- 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__) || defined(__CYGWIN__)
     #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
 
@@ -203,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
@@ -303,6 +310,10 @@ 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;
 
@@ -489,12 +500,16 @@ public:
                 wxLongLongWx& remainder) const;
 
     // input/output
+
+    // 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
 
-    void *asArray() const;
-
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs