fixed a canonical example of Stupid Bug(tm)

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 0945d472cb45ea5d76c003bfc625083f28f0df57..26f9e1c112a09c7995269563ccd4f75773439b58 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -18,7 +18,7 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

-#include "wx/wxchar.h"
+#include "wx/string.h"

 
 #include <limits.h>     // for LONG_MAX
 
 
 #include <limits.h>     // for LONG_MAX
 


@@ -88,7 +88,12 @@
     #endif
 
     class WXDLLEXPORT wxLongLongWx;
     #endif
 
     class WXDLLEXPORT wxLongLongWx;

+#if defined(__VISUALC__) && !defined(__WIN32__)
+    #define wxLongLong wxLongLongWx
+#else

     typedef wxLongLongWx wxLongLong;
     typedef wxLongLongWx wxLongLong;

+#endif
+

 #else
     // if nothing is defined, use native implementation by default, of course
     #ifndef wxUSE_LONGLONG_NATIVE
 #else
     // if nothing is defined, use native implementation by default, of course
     #ifndef wxUSE_LONGLONG_NATIVE


@@ -198,6 +203,7 @@ public:
         // negation operator
     wxLongLongNative operator-() const
         { return wxLongLongNative(-m_ll); }
         // negation operator
     wxLongLongNative operator-() const
         { return wxLongLongNative(-m_ll); }

+    wxLongLongNative& Negate() { m_ll = -m_ll; return *this; }

 
         // subtraction
     wxLongLongNative operator-(const wxLongLongNative& ll) const
 
         // subtraction
     wxLongLongNative operator-(const wxLongLongNative& ll) const


@@ -298,12 +304,16 @@ public:
         { return m_ll >= l; }
 
     // miscellaneous
         { 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
         // 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:
 #endif
 
 private:


@@ -484,12 +494,16 @@ public:
                 wxLongLongWx& remainder) const;
 
     // input/output
                 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;
 
 
     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
 
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs