Added logic, API and docs for wxDataViewModel::HasDefaultCompare indicating a compare...

[wxWidgets.git] / src / common / longlong.cpp

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index b61b13d159a9f62398572a7ece70e8a5df3268e7..85591bb67cb13663be51f55c33d799da9ca26185 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        wx/longlong.cpp
+// Name:        src/common/longlong.cpp
 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
@@ -22,15 +22,19 @@
 #endif
 
 #if wxUSE_LONGLONG
+
 #include "wx/longlong.h"
-#include "wx/math.h"       // for fabs()
 
-#if defined(__MWERKS__) && defined(__WXMSW__)
-#include <string.h>     // for memset()
-#else
-#include <memory.h>     // for memset()
+#ifndef WX_PRECOMP
+    #include "wx/math.h"       // for fabs()
+#endif
+
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"
 #endif
 
+#include <string.h>            // for memset()
+
 #include "wx/ioswrap.h"
 
 // ============================================================================
@@ -92,6 +96,41 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
     m_ll |= ll.GetLo();
     return *this;
 }
+
+wxLongLongNative& wxLongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+
+wxULongLongNative::wxULongLongNative(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+}
+
+wxULongLongNative& wxULongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
+
+wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ((unsigned long) ll.GetLo());
+    return *this;
+}
 #endif
 
 #endif // wxUSE_LONGLONG_NATIVE
@@ -102,6 +141,14 @@ wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
 
 #if wxUSE_LONGLONG_WX
 
+// Set value from unsigned wxULongLongWx
+wxLongLongWx &wxLongLongWx::operator=(const class wxULongLongWx &ll)
+{
+    m_hi = (unsigned long) ll.GetHi();
+    m_lo = ll.GetLo();
+    return *this;
+}
+
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {
@@ -143,6 +190,19 @@ double wxLongLongWx::ToDouble() const
     return d;
 }
 
+double wxULongLongWx::ToDouble() const
+{
+    unsigned double d = m_hi;
+    d *= 1.0 + (double)ULONG_MAX;
+    d += m_lo;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxASSERT( d == m_ll );
+#endif // wxLONGLONG_TEST_MODE
+
+    return d;
+}
+
 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
     wxLongLongWx ll(*this);
@@ -1191,4 +1251,113 @@ WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
     return s << ll.ToString();
 }
 
+#if wxUSE_STREAMS
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : _T('\0'))
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxULongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Read number
+    wxULongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxULongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong &ll)
+{
+    wxString s = o.ReadWord();
+
+    ll = wxLongLong(0l, 0l);
+    size_t length = s.length();
+    size_t idx = 0;
+
+    wxChar ch = READ_STRING_CHAR(s, idx, length);
+
+    // Skip WS
+    while (ch==wxT(' ') || ch==wxT('\t'))
+        ch = READ_STRING_CHAR(s, idx, length);
+
+    // Ask for sign
+    int iSign = 1;
+    if (ch==wxT('-') || ch==wxT('+')) {
+        iSign = ((ch==wxT('-')) ? -1 : 1);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+    // Read number
+    wxLongLong multiplier(0l, 10l);
+    while (ch>=wxT('0') && ch<=wxT('9')) {
+        long lValue = (unsigned) (ch - wxT('0'));
+        ll = ll * multiplier + wxLongLong(0l, lValue);
+        ch = READ_STRING_CHAR(s, idx, length);
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    ll = ll * wxLongLong((wxLongLong_t) iSign);
+#else
+    ll = ll * wxLongLong((long) iSign);
+#endif
+
+    return o;
+}
+
+#if wxUSE_LONGLONG_NATIVE
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)
+{
+    return o << wxULongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)
+{
+    return o << wxLongLong(value).ToString();
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong_t &value)
+{
+    wxULongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxLongLong_t &value)
+{
+    wxLongLong ll;
+    o >> ll;
+    value = ll.GetValue();
+    return o;
+}
+
+#endif // wxUSE_LONGLONG_NATIVE
+
+#endif // wxUSE_STREAMS
+
 #endif // wxUSE_LONGLONG