]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/longlong.cpp
added wxConvFileName which is a variable, not define as wxConvFile; added comments...
[wxWidgets.git] / src / common / longlong.cpp
index 0792e84902c663f7fa8b289710a72c5de500f01f..e3d6a5658623702d4e770d20657450224e4c1004 100644 (file)
@@ -2,20 +2,20 @@
 // Name:        wx/longlong.cpp
 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
-// Remarks:     this class is not public in wxWindows 2.0! It is intentionally
+// Remarks:     this class is not public in wxWidgets 2.0! It is intentionally
 //              not documented and is for private use only.
 // Modified by:
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "longlong.h"
 #endif
 
 #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()
-#include <math.h>       // for fabs()
+#endif
 
 // ============================================================================
 // implementation
 // misc
 // ----------------------------------------------------------------------------
 
-void *wxLongLongNative::asArray(void) const
+void *wxLongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
-    temp[0] = (m_ll >> 56) & 0xFF;
-    temp[1] = (m_ll >> 48) & 0xFF;
-    temp[2] = (m_ll >> 40) & 0xFF;
-    temp[3] = (m_ll >> 32) & 0xFF;
-    temp[4] = (m_ll >> 24) & 0xFF;
-    temp[5] = (m_ll >> 16) & 0xFF;
-    temp[6] = (m_ll >> 8)  & 0xFF;
-    temp[7] = (m_ll >> 0)  & 0xFF;
+    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
+    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
+    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
+    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
+    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
+    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
+    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
+    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
 
     return temp;
 }
 
-#if wxUSE_STD_IOSTREAM
-
-// input/output
-ostream& operator<< (ostream& o, const wxLongLongNative& ll)
+void *wxULongLongNative::asArray() const
 {
-    char result[65];
-
-    memset(result, 'A', 64);
+    static unsigned char temp[8];
 
-    result[64] = '\0';
+    temp[0] = (unsigned char)((m_ll >> 56) & 0xFF);
+    temp[1] = (unsigned char)((m_ll >> 48) & 0xFF);
+    temp[2] = (unsigned char)((m_ll >> 40) & 0xFF);
+    temp[3] = (unsigned char)((m_ll >> 32) & 0xFF);
+    temp[4] = (unsigned char)((m_ll >> 24) & 0xFF);
+    temp[5] = (unsigned char)((m_ll >> 16) & 0xFF);
+    temp[6] = (unsigned char)((m_ll >> 8)  & 0xFF);
+    temp[7] = (unsigned char)((m_ll >> 0)  & 0xFF);
 
-    for (int i = 0; i < 64; i++)
-    {
-        result[63 - i] = '0' + (char) ((ll.m_ll >> i) & 1);
-    }
+    return temp;
+}
 
-    return o << result;
+#if wxUSE_LONGLONG_WX
+wxLongLongNative::wxLongLongNative(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
 }
 
-#endif // wxUSE_STD_IOSTREAM
+wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    m_ll |= ll.GetLo();
+    return *this;
+}
+#endif
 
 #endif // wxUSE_LONGLONG_NATIVE
 
@@ -90,110 +107,197 @@ ostream& operator<< (ostream& o, const wxLongLongNative& ll)
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {
-    if ( fabs(d) <= LONG_MAX )
+    bool positive = d >= 0;
+    d = fabs(d);
+    if ( d <= ULONG_MAX )
     {
-        m_hi = d < 0 ? 1 << (8*sizeof(long) - 1) : 0l;
+        m_hi = 0;
         m_lo = (long)d;
     }
     else
     {
-        wxFAIL_MSG(_T("TODO"));       
+        m_hi = (unsigned long)(d / (1.0 + (double)ULONG_MAX));
+        m_lo = (unsigned long)(d - ((double)m_hi * (1.0 + (double)ULONG_MAX)));
     }
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = (wxLongLong_t)d;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    if ( !positive )
+        Negate();
+
     return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
-    if (shift == 0)
-        return *this;
+    wxLongLongWx ll(*this);
+    ll <<= shift;
 
-    if (shift < 32)
-        return wxLongLongWx((m_hi << shift) | (m_lo >> (32 - shift)),
-                             m_lo << shift);
-    else
-        return wxLongLongWx(m_lo << (shift - 32),
-                            0);
+    return ll;
 }
 
-wxLongLongWx& wxLongLongWx::operator<<=(int shift)
+wxULongLongWx wxULongLongWx::operator<<(int shift) const
 {
-    if (shift == 0)
-        return *this;
+    wxULongLongWx ll(*this);
+    ll <<= shift;
 
-    if (shift < 32)
+    return ll;
+}
+
+wxLongLongWx& wxLongLongWx::operator<<=(int shift)
+{
+    if (shift != 0)
     {
-        m_hi <<= shift;
-        m_hi |= m_lo >> (32 - shift);
-        m_lo <<= shift;
+        if (shift < 32)
+        {
+            m_hi <<= shift;
+            m_hi |= m_lo >> (32 - shift);
+            m_lo <<= shift;
+        }
+        else
+        {
+            m_hi = m_lo << (shift - 32);
+            m_lo = 0;
+        }
     }
-    else
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll <<= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator<<=(int shift)
+{
+    if (shift != 0)
     {
-        m_hi = m_lo << (shift - 32);
-        m_lo = 0;
+        if (shift < 32)
+        {
+            m_hi <<= shift;
+            m_hi |= m_lo >> (32 - shift);
+            m_lo <<= shift;
+        }
+        else
+        {
+            m_hi = m_lo << (shift - 32);
+            m_lo = 0;
+        }
     }
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll <<= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator>>(int shift) const
 {
-    if (shift == 0)
-        return *this;
+    wxLongLongWx ll(*this);
+    ll >>= shift;
 
-    if (shift < 32)
-        return wxLongLongWx(m_hi >> shift,
-                          (m_lo >> shift) | (m_hi << (32 - shift)));
-    else
-        return wxLongLongWx((m_hi < 0 ? -1l : 0),
-                          m_hi >> (shift - 32));
+    return ll;
 }
 
-wxLongLongWx& wxLongLongWx::operator>>=(int shift)
+wxULongLongWx wxULongLongWx::operator>>(int shift) const
 {
-    if (shift == 0)
-        return *this;
+    wxULongLongWx ll(*this);
+    ll >>= shift;
+
+    return ll;
+}
 
-    if (shift < 32)
+wxLongLongWx& wxLongLongWx::operator>>=(int shift)
+{
+    if (shift != 0)
     {
-        m_lo >>= shift;
-        m_lo |= m_hi << (32 - shift);
-        m_hi >>= shift;
+        if (shift < 32)
+        {
+            m_lo >>= shift;
+            m_lo |= m_hi << (32 - shift);
+            m_hi >>= shift;
+        }
+        else
+        {
+            m_lo = m_hi >> (shift - 32);
+            m_hi = (m_hi < 0 ? -1L : 0);
+        }
     }
-    else
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll >>= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator>>=(int shift)
+{
+    if (shift != 0)
     {
-        m_lo = m_hi >> (shift - 32);
-        m_hi = (m_hi < 0 ? -1L : 0);
+        if (shift < 32)
+        {
+            m_lo >>= shift;
+            m_lo |= m_hi << (32 - shift);
+            m_hi >>= shift;
+        }
+        else
+        {
+            m_lo = m_hi >> (shift - 32);
+            m_hi = 0;
+        }
     }
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll >>= shift;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator+(const wxLongLongWx& ll) const
 {
-    wxLongLongWx temp;
+    wxLongLongWx res(*this);
+    res += ll;
 
-    temp.m_lo = m_lo + ll.m_lo;
-    temp.m_hi = m_hi + ll.m_hi;
-    if ((temp.m_lo < m_lo) || (temp.m_lo < ll.m_lo))
-        temp.m_hi++;
+    return res;
+}
 
-    return temp;
+wxULongLongWx wxULongLongWx::operator+(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res += ll;
+
+    return res;
 }
 
 wxLongLongWx wxLongLongWx::operator+(long l) const
 {
-    wxLongLongWx temp;
-
-    temp.m_lo = m_lo + l;
+    wxLongLongWx res(*this);
+    res += l;
 
-    if (l < 0)
-        temp.m_hi += -1l;
+    return res;
+}
 
-    if ((temp.m_lo < m_lo) || (temp.m_lo < (unsigned long)l))
-        temp.m_hi++;
+wxULongLongWx wxULongLongWx::operator+(unsigned long l) const
+{
+    wxULongLongWx res(*this);
+    res += l;
 
-    return temp;
+    return res;
 }
 
 wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
@@ -206,6 +310,31 @@ wxLongLongWx& wxLongLongWx::operator+=(const wxLongLongWx& ll)
     if ((m_lo < previous) || (m_lo < ll.m_lo))
         m_hi++;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator+=(const wxULongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += ll.m_lo;
+    m_hi += ll.m_hi;
+
+    if ((m_lo < previous) || (m_lo < ll.m_lo))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -220,6 +349,30 @@ wxLongLongWx& wxLongLongWx::operator+=(long l)
     if ((m_lo < previous) || (m_lo < (unsigned long)l))
         m_hi++;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += l;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator+=(unsigned long l)
+{
+    unsigned long previous = m_lo;
+
+    m_lo += l;
+
+    if ((m_lo < previous) || (m_lo < l))
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll += l;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -230,44 +383,77 @@ wxLongLongWx& wxLongLongWx::operator++()
     if (m_lo == 0)
         m_hi++;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll++;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
-// post increment
-wxLongLongWx& wxLongLongWx::operator++(int)
+wxULongLongWx& wxULongLongWx::operator++()
 {
     m_lo++;
     if (m_lo == 0)
         m_hi++;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll++;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
 // negation
 wxLongLongWx wxLongLongWx::operator-() const
 {
-    wxLongLongWx temp(~m_hi, ~m_lo);
+    wxLongLongWx res(*this);
+    res.Negate();
 
-    temp.m_lo++;
-    if (temp.m_lo == 0)
-        temp.m_hi++;
+    return res;
+}
 
-    return temp;
+wxLongLongWx& wxLongLongWx::Negate()
+{
+    m_hi = ~m_hi;
+    m_lo = ~m_lo;
+
+    m_lo++;
+    if ( m_lo == 0 )
+        m_hi++;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = -m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
 }
 
 // subtraction
 
 wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
 {
-    wxLongLongWx temp;
+    wxLongLongWx res(*this);
+    res -= ll;
+
+    return res;
+}
 
-    temp.m_lo = m_lo - ll.m_lo;
-    temp.m_hi = m_hi - ll.m_hi;
+wxLongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const
+{
+    wxASSERT(m_hi <= LONG_MAX );
+    wxASSERT(ll.m_hi <= LONG_MAX );
 
-    if (m_lo < ll.m_lo)
-        temp.m_hi--;
+    wxLongLongWx res( (long)m_hi , m_lo );
+    wxLongLongWx op( (long)ll.m_hi , ll.m_lo );
+    res -= op;
 
-    return temp;
+    return res;
 }
 
 wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
@@ -280,7 +466,32 @@ wxLongLongWx& wxLongLongWx::operator-=(const wxLongLongWx& ll)
     if (previous < ll.m_lo)
         m_hi--;
 
-    return *this;;
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll -= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator-=(const wxULongLongWx& ll)
+{
+    unsigned long previous = m_lo;
+
+    m_lo -= ll.m_lo;
+    m_hi -= ll.m_hi;
+
+    if (previous < ll.m_lo)
+        m_hi--;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll -= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
 }
 
 // pre decrement
@@ -290,16 +501,27 @@ wxLongLongWx& wxLongLongWx::operator--()
     if (m_lo == 0xFFFFFFFF)
         m_hi--;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
-// post decrement
-wxLongLongWx& wxLongLongWx::operator--(int)
+wxULongLongWx& wxULongLongWx::operator--()
 {
     m_lo--;
     if (m_lo == 0xFFFFFFFF)
         m_hi--;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll--;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -308,21 +530,41 @@ wxLongLongWx& wxLongLongWx::operator--(int)
 bool wxLongLongWx::operator<(const wxLongLongWx& ll) const
 {
     if ( m_hi < ll.m_hi )
-        return TRUE;
+        return true;
     else if ( m_hi == ll.m_hi )
         return m_lo < ll.m_lo;
     else
-        return FALSE;
+        return false;
+}
+
+bool wxULongLongWx::operator<(const wxULongLongWx& ll) const
+{
+    if ( m_hi < ll.m_hi )
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo < ll.m_lo;
+    else
+        return false;
 }
 
 bool wxLongLongWx::operator>(const wxLongLongWx& ll) const
 {
     if ( m_hi > ll.m_hi )
-        return TRUE;
+        return true;
+    else if ( m_hi == ll.m_hi )
+        return m_lo > ll.m_lo;
+    else
+        return false;
+}
+
+bool wxULongLongWx::operator>(const wxULongLongWx& ll) const
+{
+    if ( m_hi > ll.m_hi )
+        return true;
     else if ( m_hi == ll.m_hi )
         return m_lo > ll.m_lo;
     else
-        return FALSE;
+        return false;
 }
 
 // bitwise operators
@@ -332,21 +574,56 @@ wxLongLongWx wxLongLongWx::operator&(const wxLongLongWx& ll) const
     return wxLongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
 }
 
+wxULongLongWx wxULongLongWx::operator&(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi & ll.m_hi, m_lo & ll.m_lo);
+}
+
 wxLongLongWx wxLongLongWx::operator|(const wxLongLongWx& ll) const
 {
     return wxLongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
 }
 
+wxULongLongWx wxULongLongWx::operator|(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi | ll.m_hi, m_lo | ll.m_lo);
+}
+
 wxLongLongWx wxLongLongWx::operator^(const wxLongLongWx& ll) const
 {
     return wxLongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
 }
 
+wxULongLongWx wxULongLongWx::operator^(const wxULongLongWx& ll) const
+{
+    return wxULongLongWx(m_hi ^ ll.m_hi, m_lo ^ ll.m_lo);
+}
+
 wxLongLongWx& wxLongLongWx::operator&=(const wxLongLongWx& ll)
 {
     m_lo &= ll.m_lo;
     m_hi &= ll.m_hi;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll &= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator&=(const wxULongLongWx& ll)
+{
+    m_lo &= ll.m_lo;
+    m_hi &= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll &= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -355,6 +632,26 @@ wxLongLongWx& wxLongLongWx::operator|=(const wxLongLongWx& ll)
     m_lo |= ll.m_lo;
     m_hi |= ll.m_hi;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll |= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator|=(const wxULongLongWx& ll)
+{
+    m_lo |= ll.m_lo;
+    m_hi |= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll |= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -363,6 +660,26 @@ wxLongLongWx& wxLongLongWx::operator^=(const wxLongLongWx& ll)
     m_lo ^= ll.m_lo;
     m_hi ^= ll.m_hi;
 
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll ^= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator^=(const wxULongLongWx& ll)
+{
+    m_lo ^= ll.m_lo;
+    m_hi ^= ll.m_hi;
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll ^= ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -371,42 +688,90 @@ wxLongLongWx wxLongLongWx::operator~() const
     return wxLongLongWx(~m_hi, ~m_lo);
 }
 
+wxULongLongWx wxULongLongWx::operator~() const
+{
+    return wxULongLongWx(~m_hi, ~m_lo);
+}
+
 // multiplication
 
 wxLongLongWx wxLongLongWx::operator*(const wxLongLongWx& ll) const
+{
+    wxLongLongWx res(*this);
+    res *= ll;
+
+    return res;
+}
+
+wxULongLongWx wxULongLongWx::operator*(const wxULongLongWx& ll) const
+{
+    wxULongLongWx res(*this);
+    res *= ll;
+
+    return res;
+}
+
+wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
 {
     wxLongLongWx t(m_hi, m_lo);
     wxLongLongWx q(ll.m_hi, ll.m_lo);
-    wxLongLongWx p;
-    int counter = 0;
 
+    m_hi = m_lo = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxLongLong_t llOld = m_ll;
+    m_ll = 0;
+#endif // wxLONGLONG_TEST_MODE
+
+    int counter = 0;
     do
     {
         if ((q.m_lo & 1) != 0)
-              p += t;
+            *this += t;
         q >>= 1;
         t <<= 1;
         counter++;
-      }
-      while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
-    return p;
+    }
+    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = llOld * ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
+    return *this;
 }
 
-wxLongLongWx& wxLongLongWx::operator*=(const wxLongLongWx& ll)
+wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
 {
-    wxLongLongWx t(m_hi, m_lo);
-    wxLongLongWx q(ll.m_hi, ll.m_lo);
-    int counter = 0;
+    wxULongLongWx t(m_hi, m_lo);
+    wxULongLongWx q(ll.m_hi, ll.m_lo);
+
+    m_hi = m_lo = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+    wxULongLong_t llOld = m_ll;
+    m_ll = 0;
+#endif // wxLONGLONG_TEST_MODE
 
+    int counter = 0;
     do
     {
         if ((q.m_lo & 1) != 0)
-              *this += t;
+            *this += t;
         q >>= 1;
         t <<= 1;
         counter++;
-      }
-      while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
+    }
+    while ((counter < 64) && ((q.m_hi != 0) || (q.m_lo != 0)));
+
+#ifdef wxLONGLONG_TEST_MODE
+    m_ll = llOld * ll.m_ll;
+
+    Check();
+#endif // wxLONGLONG_TEST_MODE
+
     return *this;
 }
 
@@ -435,7 +800,7 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //     Use of this program, for any purpose, is granted the author, Ian
     //     Kaplan, as long as this copyright notice is included in the source
     //     code or any source code derived from this program. The user assumes
-    //     all responsibility for using this code. 
+    //     all responsibility for using this code.
 
     // init everything
     wxLongLongWx dividend = *this,
@@ -444,21 +809,6 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     quotient = 0l;
     remainder = 0l;
 
-    // check for some particular cases
-    if ( divisor > dividend )
-    {
-        remainder = dividend;
-
-        return;
-    }
-
-    if ( divisor == dividend )
-    {
-        quotient = 1l;
-
-        return;
-    }
-
     // always do unsigned division and adjust the signs later: in C integer
     // division, the sign of the remainder is the same as the sign of the
     // dividend, while the sign of the quotient is the product of the signs of
@@ -468,7 +818,7 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //
     // with 0 <= abs(remainder) < abs(divisor)
     bool negRemainder = dividend.m_hi < 0;
-    bool negQuotient = FALSE;   // assume positive
+    bool negQuotient = false;   // assume positive
     if ( dividend.m_hi < 0 )
     {
         negQuotient = !negQuotient;
@@ -480,47 +830,59 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
         divisor = -divisor;
     }
 
-    // here: dividend > divisor and both are positibe: do unsigned division
-    size_t nBits = 64u;
-    wxLongLongWx d;
-
-    #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
-
-    while ( remainder < divisor )
+    // check for some particular cases
+    if ( divisor > dividend )
     {
-        remainder <<= 1;
-        if ( IS_MSB_SET(dividend) )
-        {
-            remainder |= 1;
-        }
-
-        d = dividend;
-        dividend <<= 1;
-
-        nBits--;
+        remainder = dividend;
+    }
+    else if ( divisor == dividend )
+    {
+        quotient = 1l;
     }
+    else
+    {
+        // here: dividend > divisor and both are positive: do unsigned division
+        size_t nBits = 64u;
+        wxLongLongWx d;
 
-    // undo the last loop iteration
-    dividend = d;
-    remainder >>= 1;
-    nBits++;
+        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
 
-    for ( size_t i = 0; i < nBits; i++ )
-    {
-        remainder <<= 1;
-        if ( IS_MSB_SET(dividend) )
+        while ( remainder < divisor )
         {
-            remainder |= 1;
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            d = dividend;
+            dividend <<= 1;
+
+            nBits--;
         }
 
-        wxLongLongWx t = remainder - divisor;
-        dividend <<= 1;
-        quotient <<= 1;
-        if ( !IS_MSB_SET(t) )
-        {
-            quotient |= 1;
+        // undo the last loop iteration
+        dividend = d;
+        remainder >>= 1;
+        nBits++;
 
-            remainder = t;
+        for ( size_t i = 0; i < nBits; i++ )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            wxLongLongWx t = remainder - divisor;
+            dividend <<= 1;
+            quotient <<= 1;
+            if ( !IS_MSB_SET(t) )
+            {
+                quotient |= 1;
+
+                remainder = t;
+            }
         }
     }
 
@@ -536,6 +898,95 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     }
 }
 
+void wxULongLongWx::Divide(const wxULongLongWx& divisorIn,
+                           wxULongLongWx& quotient,
+                           wxULongLongWx& remainder) const
+{
+    if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
+    {
+        // provoke division by zero error and silence the compilers warnings
+        // about an expression without effect and unused variable
+        unsigned long dummy = divisorIn.m_lo/divisorIn.m_hi;
+        dummy += 0;
+    }
+
+    // VZ: I'm writing this in a hurry and it's surely not the fastest way to
+    //     do this - any improvements are more than welcome
+    //
+    //     code inspired by the snippet at
+    //          http://www.bearcave.com/software/divide.htm
+    //
+    //     Copyright notice:
+    //
+    //     Use of this program, for any purpose, is granted the author, Ian
+    //     Kaplan, as long as this copyright notice is included in the source
+    //     code or any source code derived from this program. The user assumes
+    //     all responsibility for using this code.
+
+    // init everything
+    wxULongLongWx dividend = *this,
+                  divisor = divisorIn;
+
+    quotient = 0l;
+    remainder = 0l;
+
+    // check for some particular cases
+    if ( divisor > dividend )
+    {
+        remainder = dividend;
+    }
+    else if ( divisor == dividend )
+    {
+        quotient = 1l;
+    }
+    else
+    {
+        // here: dividend > divisor
+        size_t nBits = 64u;
+        wxULongLongWx d;
+
+        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
+
+        while ( remainder < divisor )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            d = dividend;
+            dividend <<= 1;
+
+            nBits--;
+        }
+
+        // undo the last loop iteration
+        dividend = d;
+        remainder >>= 1;
+        nBits++;
+
+        for ( size_t i = 0; i < nBits; i++ )
+        {
+            remainder <<= 1;
+            if ( IS_MSB_SET(dividend) )
+            {
+                remainder |= 1;
+            }
+
+            wxULongLongWx t = remainder - divisor;
+            dividend <<= 1;
+            quotient <<= 1;
+            if ( !IS_MSB_SET(t) )
+            {
+                quotient |= 1;
+
+                remainder = t;
+            }
+        }
+    }
+}
+
 wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const
 {
     wxLongLongWx quotient, remainder;
@@ -545,13 +996,35 @@ wxLongLongWx wxLongLongWx::operator/(const wxLongLongWx& ll) const
     return quotient;
 }
 
+wxULongLongWx wxULongLongWx::operator/(const wxULongLongWx& ll) const
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return quotient;
+}
+
 wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
 {
     wxLongLongWx quotient, remainder;
 
     Divide(ll, quotient, remainder);
 
-    return *this = quotient;
+    *this = quotient;
+
+    return *this;
+}
+
+wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    *this = quotient;
+
+    return *this;
 }
 
 wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
@@ -563,6 +1036,15 @@ wxLongLongWx wxLongLongWx::operator%(const wxLongLongWx& ll) const
     return remainder;
 }
 
+wxULongLongWx wxULongLongWx::operator%(const wxULongLongWx& ll) const
+{
+    wxULongLongWx quotient, remainder;
+
+    Divide(ll, quotient, remainder);
+
+    return remainder;
+}
+
 // ----------------------------------------------------------------------------
 // misc
 // ----------------------------------------------------------------------------
@@ -572,39 +1054,127 @@ void *wxLongLongWx::asArray(void) const
 {
     static unsigned char temp[8];
 
-    temp[0] = (m_hi >> 24) & 0xFF;
-    temp[1] = (m_hi >> 16) & 0xFF;
-    temp[2] = (m_hi >> 8)  & 0xFF;
-    temp[3] = (m_hi >> 0)  & 0xFF;
-    temp[4] = (m_lo >> 24) & 0xFF;
-    temp[5] = (m_lo >> 16) & 0xFF;
-    temp[6] = (m_lo >> 8)  & 0xFF;
-    temp[7] = (m_lo >> 0)  & 0xFF;
+    temp[0] = (char)((m_hi >> 24) & 0xFF);
+    temp[1] = (char)((m_hi >> 16) & 0xFF);
+    temp[2] = (char)((m_hi >> 8)  & 0xFF);
+    temp[3] = (char)((m_hi >> 0)  & 0xFF);
+    temp[4] = (char)((m_lo >> 24) & 0xFF);
+    temp[5] = (char)((m_lo >> 16) & 0xFF);
+    temp[6] = (char)((m_lo >> 8)  & 0xFF);
+    temp[7] = (char)((m_lo >> 0)  & 0xFF);
 
     return temp;
 }
 
-#if wxUSE_STD_IOSTREAM
-
-// input/output
-ostream& operator<< (ostream& o, const wxLongLongWx& ll)
+void *wxULongLongWx::asArray(void) const
 {
-    char result[65];
+    static unsigned char temp[8];
 
-    memset(result, 'A', 64);
+    temp[0] = (char)((m_hi >> 24) & 0xFF);
+    temp[1] = (char)((m_hi >> 16) & 0xFF);
+    temp[2] = (char)((m_hi >> 8)  & 0xFF);
+    temp[3] = (char)((m_hi >> 0)  & 0xFF);
+    temp[4] = (char)((m_lo >> 24) & 0xFF);
+    temp[5] = (char)((m_lo >> 16) & 0xFF);
+    temp[6] = (char)((m_lo >> 8)  & 0xFF);
+    temp[7] = (char)((m_lo >> 0)  & 0xFF);
 
-    result[64] = '\0';
+    return temp;
+}
 
-    for (int i = 0; i < 32; i++)
-    {
-        result[31 - i] = (char) ('0' + (int) ((ll.m_hi >> i) & 1));
-        result[63 - i] = (char) ('0' + (int) ((ll.m_lo >> i) & 1));
+#endif // wxUSE_LONGLONG_WX
+
+#define LL_TO_STRING(name)                                           \
+    wxString name::ToString() const                                  \
+    {                                                                \
+        /* TODO: this is awfully inefficient, anything better? */    \
+        wxString result;                                             \
+                                                                     \
+        name ll = *this;                                             \
+                                                                     \
+        bool neg = ll < 0;                                           \
+        if ( neg )                                                   \
+        {                                                            \
+            while ( ll != 0 )                                        \
+            {                                                        \
+                long digit = (ll % 10).ToLong();                     \
+                result.Prepend((wxChar)(_T('0') - digit));           \
+                ll /= 10;                                            \
+            }                                                        \
+        }                                                            \
+        else                                                         \
+        {                                                            \
+            while ( ll != 0 )                                        \
+            {                                                        \
+                long digit = (ll % 10).ToLong();                     \
+                result.Prepend((wxChar)(_T('0') + digit));           \
+                ll /= 10;                                            \
+            }                                                        \
+        }                                                            \
+                                                                     \
+        if ( result.empty() )                                        \
+            result = _T('0');                                        \
+        else if ( neg )                                              \
+            result.Prepend(_T('-'));                                 \
+                                                                     \
+        return result;                                               \
     }
 
-    return o << result;
+#define ULL_TO_STRING(name)                                          \
+    wxString name::ToString() const                                  \
+    {                                                                \
+        /* TODO: this is awfully inefficient, anything better? */    \
+        wxString result;                                             \
+                                                                     \
+        name ll = *this;                                             \
+                                                                     \
+        while ( ll != 0 )                                            \
+        {                                                            \
+            result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); \
+            ll /= 10;                                                \
+        }                                                            \
+                                                                     \
+        if ( result.empty() )                                        \
+            result = _T('0');                                        \
+                                                                     \
+        return result;                                               \
+    }
+
+#if wxUSE_LONGLONG_NATIVE
+    LL_TO_STRING(wxLongLongNative)
+    ULL_TO_STRING(wxULongLongNative)
+#endif
+
+#if wxUSE_LONGLONG_WX
+    LL_TO_STRING(wxLongLongWx)
+    ULL_TO_STRING(wxULongLongWx)
+#endif
+
+#if wxUSE_STD_IOSTREAM
+
+// input/output
+WXDLLIMPEXP_BASE
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
+{
+    return o << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
 }
+
 #endif // wxUSE_STD_IOSTREAM
 
-#endif // wxUSE_LONGLONG_NATIVE
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxLongLong& ll)
+{
+    return s << ll.ToString();
+}
+
+WXDLLIMPEXP_BASE wxString& operator<< (wxString& s, const wxULongLong& ll)
+{
+    return s << ll.ToString();
+}
 
 #endif // wxUSE_LONGLONG