added the possibility to rescale the image during loading, especially useful with...

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

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 90dd05b8e40c2ff55feea6253c2edb032e1a1493..85591bb67cb13663be51f55c33d799da9ca26185 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -1,24 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/longlong.cpp
+// Name:        src/common/longlong.cpp

 // Purpose:     implementation of wxLongLongNative
 // Author:      Jeffrey C. Ollie <jeff@ollie.clive.ia.us>, Vadim Zeitlin
 // 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>
 //              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
 // ============================================================================
 
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 // headers
 // ============================================================================
 

-#ifdef __GNUG__
-    #pragma implementation "longlong.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -26,15 +22,20 @@
 #endif
 
 #if wxUSE_LONGLONG
 #endif
 
 #if wxUSE_LONGLONG

+

 #include "wx/longlong.h"
 
 #include "wx/longlong.h"
 

-#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
 
 #endif
 

-#include <math.h>       // for fabs()
+#if wxUSE_STREAMS
+    #include "wx/txtstrm.h"
+#endif
+
+#include <string.h>            // for memset()
+
+#include "wx/ioswrap.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -50,14 +51,14 @@ void *wxLongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
 {
     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] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));

 
     return temp;
 }
 
     return temp;
 }


@@ -66,18 +67,72 @@ void *wxULongLongNative::asArray() const
 {
     static unsigned char temp[8];
 
 {
     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] = wx_truncate_cast(unsigned char, ((m_ll >> 56) & 0xFF));
+    temp[1] = wx_truncate_cast(unsigned char, ((m_ll >> 48) & 0xFF));
+    temp[2] = wx_truncate_cast(unsigned char, ((m_ll >> 40) & 0xFF));
+    temp[3] = wx_truncate_cast(unsigned char, ((m_ll >> 32) & 0xFF));
+    temp[4] = wx_truncate_cast(unsigned char, ((m_ll >> 24) & 0xFF));
+    temp[5] = wx_truncate_cast(unsigned char, ((m_ll >> 16) & 0xFF));
+    temp[6] = wx_truncate_cast(unsigned char, ((m_ll >> 8)  & 0xFF));
+    temp[7] = wx_truncate_cast(unsigned char, ((m_ll >> 0)  & 0xFF));

 
     return temp;
 }
 
 
     return temp;
 }
 

+#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();
+}
+
+wxLongLongNative& wxLongLongNative::operator=(wxLongLongWx ll)
+{
+    // assign first to avoid precision loss!
+    m_ll = ll.GetHi();
+    m_ll <<= 32;
+    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
 
 // ============================================================================
 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================


@@ -86,6 +141,14 @@ void *wxULongLongNative::asArray() const
 
 #if wxUSE_LONGLONG_WX
 
 
 #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)
 {
 // assignment
 wxLongLongWx& wxLongLongWx::Assign(double d)
 {


@@ -114,6 +177,32 @@ wxLongLongWx& wxLongLongWx::Assign(double d)
     return *this;
 }
 
     return *this;
 }
 

+double wxLongLongWx::ToDouble() const
+{
+    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;
+}
+
+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);
 wxLongLongWx wxLongLongWx::operator<<(int shift) const
 {
     wxLongLongWx ll(*this);


@@ -426,10 +515,14 @@ wxLongLongWx wxLongLongWx::operator-(const wxLongLongWx& ll) const
     return res;
 }
 
     return res;
 }
 

-wxULongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const
+wxLongLongWx wxULongLongWx::operator-(const wxULongLongWx& ll) const

 {
 {

-    wxULongLongWx res(*this);
-    res -= ll;
+    wxASSERT(m_hi <= LONG_MAX );
+    wxASSERT(ll.m_hi <= LONG_MAX );
+
+    wxLongLongWx res( (long)m_hi , m_lo );
+    wxLongLongWx op( (long)ll.m_hi , ll.m_lo );
+    res -= op;

 
     return res;
 }
 
     return res;
 }


@@ -508,41 +601,41 @@ wxULongLongWx& wxULongLongWx::operator--()
 bool wxLongLongWx::operator<(const wxLongLongWx& ll) const
 {
     if ( m_hi < ll.m_hi )
 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
     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 )
 }
 
 bool wxULongLongWx::operator<(const wxULongLongWx& 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
     else if ( m_hi == ll.m_hi )
         return m_lo < ll.m_lo;
     else

-        return FALSE;
+        return false;

 }
 
 bool wxLongLongWx::operator>(const wxLongLongWx& ll) const
 {
     if ( m_hi > ll.m_hi )
 }
 
 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
     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 )
 }
 
 bool wxULongLongWx::operator>(const wxULongLongWx& 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
     else if ( m_hi == ll.m_hi )
         return m_lo > ll.m_lo;
     else

-        return FALSE;
+        return false;

 }
 
 // bitwise operators
 }
 
 // bitwise operators


@@ -729,7 +822,7 @@ wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
     m_hi = m_lo = 0;
 
 #ifdef wxLONGLONG_TEST_MODE
     m_hi = m_lo = 0;
 
 #ifdef wxLONGLONG_TEST_MODE

-    unsigned wxLongLong_t llOld = m_ll;
+    wxULongLong_t llOld = m_ll;

     m_ll = 0;
 #endif // wxLONGLONG_TEST_MODE
 
     m_ll = 0;
 #endif // wxLONGLONG_TEST_MODE
 


@@ -755,9 +848,11 @@ wxULongLongWx& wxULongLongWx::operator*=(const wxULongLongWx& ll)
 
 // division
 
 
 // division
 

+#define IS_MSB_SET(ll)  ((ll.GetHi()) & (1 << (8*sizeof(long) - 1)))
+

 void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
                           wxLongLongWx& quotient,
 void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
                           wxLongLongWx& quotient,

-                          wxLongLongWx& remainder) const
+                          wxLongLongWx& remainderIO) const

 {
     if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
     {
 {
     if ((divisorIn.m_lo == 0) && (divisorIn.m_hi == 0))
     {


@@ -781,8 +876,7 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //     all responsibility for using this code.
 
     // init everything
     //     all responsibility for using this code.
 
     // init everything

-    wxLongLongWx dividend = *this,
-                 divisor = divisorIn;
+    wxULongLongWx dividend, divisor, remainder;

 
     quotient = 0l;
     remainder = 0l;
 
     quotient = 0l;
     remainder = 0l;


@@ -795,17 +889,21 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     //      dividend = quotient*divisor + remainder
     //
     // with 0 <= abs(remainder) < abs(divisor)
     //      dividend = quotient*divisor + remainder
     //
     // with 0 <= abs(remainder) < abs(divisor)

-    bool negRemainder = dividend.m_hi < 0;
-    bool negQuotient = FALSE;   // assume positive
-    if ( dividend.m_hi < 0 )
+    bool negRemainder = GetHi() < 0;
+    bool negQuotient = false;   // assume positive
+    if ( GetHi() < 0 )

     {
         negQuotient = !negQuotient;
     {
         negQuotient = !negQuotient;

-        dividend = -dividend;
+        dividend = -*this;
+    } else {
+        dividend = *this;

     }
     }

-    if ( divisor.m_hi < 0 )
+    if ( divisorIn.GetHi() < 0 )

     {
         negQuotient = !negQuotient;
     {
         negQuotient = !negQuotient;

-        divisor = -divisor;
+        divisor = -divisorIn;
+    } else {
+        divisor = divisorIn;

     }
 
     // check for some particular cases
     }
 
     // check for some particular cases


@@ -819,12 +917,10 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
     }
     else
     {
     }
     else
     {

-        // here: dividend > divisor and both are positibe: do unsigned division
+        // here: dividend > divisor and both are positive: do unsigned division

         size_t nBits = 64u;
         wxLongLongWx d;
 
         size_t nBits = 64u;
         wxLongLongWx d;
 

-        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
-

         while ( remainder < divisor )
         {
             remainder <<= 1;
         while ( remainder < divisor )
         {
             remainder <<= 1;


@@ -864,10 +960,12 @@ void wxLongLongWx::Divide(const wxLongLongWx& divisorIn,
         }
     }
 
         }
     }
 

+    remainderIO = remainder;
+

     // adjust signs
     if ( negRemainder )
     {
     // adjust signs
     if ( negRemainder )
     {

-        remainder = -remainder;
+        remainderIO = -remainderIO;

     }
 
     if ( negQuotient )
     }
 
     if ( negQuotient )


@@ -923,8 +1021,6 @@ void wxULongLongWx::Divide(const wxULongLongWx& divisorIn,
         size_t nBits = 64u;
         wxULongLongWx d;
 
         size_t nBits = 64u;
         wxULongLongWx d;
 

-        #define IS_MSB_SET(ll)  ((ll.m_hi) & (1 << (8*sizeof(long) - 1)))
-

         while ( remainder < divisor )
         {
             remainder <<= 1;
         while ( remainder < divisor )
         {
             remainder <<= 1;


@@ -996,7 +1092,7 @@ wxLongLongWx& wxLongLongWx::operator/=(const wxLongLongWx& ll)
 
 wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
 {
 
 wxULongLongWx& wxULongLongWx::operator/=(const wxULongLongWx& ll)
 {

-    wxLongLongWx quotient, remainder;
+    wxULongLongWx quotient, remainder;

 
     Divide(ll, quotient, remainder);
 
 
     Divide(ll, quotient, remainder);
 


@@ -1062,80 +1158,206 @@ void *wxULongLongWx::asArray(void) const
 
 #endif // wxUSE_LONGLONG_WX
 
 
 #endif // wxUSE_LONGLONG_WX
 

-wxString
+#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;                                               \
+    }
+
+#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
 #if wxUSE_LONGLONG_NATIVE

-wxLongLongNative::ToString() const
-#else
-wxLongLongWx::ToString() const
+    LL_TO_STRING(wxLongLongNative)
+    ULL_TO_STRING(wxULongLongNative)

 #endif
 #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)

 {
 {

-    // TODO: this is awfully inefficient, anything better?
-    wxString result;
+    return o << ll.ToString();
+}

 
 

-    wxLongLong ll = *this;
+WXDLLIMPEXP_BASE
+wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();
+}

 
 

-    bool neg;
-    if ( ll < 0 )
-    {
-        ll.Negate();
-        neg = TRUE;
-    }
-    else
-    {
-        neg = FALSE;
-    }
+#endif // wxUSE_STD_IOSTREAM

 
 

-    while ( ll != 0 )
-    {
-        result.Prepend((wxChar)(_T('0') + (ll % 10).ToLong()));
-        ll /= 10;
-    }
+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();
+}

 
 

-    if ( result.empty() )
-        result = _T('0');
-    else if ( neg )
-        result.Prepend(_T('-'));
+#if wxUSE_STREAMS

 
 

-    return result;
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxULongLong& ll)
+{
+    return o << ll.ToString();

 }
 
 }
 

-wxString
-#if wxUSE_LONGLONG_NATIVE
-wxULongLongNative::ToString() const
-#else
-wxULongLongWx::ToString() const
-#endif
+WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wxLongLong& ll)

 {
 {

-    // TODO: this is awfully inefficient, anything better?
-    wxString result;
+    return o << ll.ToString();
+}

 
 

-    wxULongLong ll = *this;
+#define READ_STRING_CHAR(s, idx, len) ((idx!=len) ? (wxChar)s[idx++] : _T('\0'))

 
 

-    while ( ll != 0 )
-    {
-        result.Prepend((wxChar)(_T('0') + (ll % 10).ToLong()));
-        ll /= 10;
+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);

     }
 
     }
 

-    if ( result.empty() )
-        result = _T('0');
+    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 result;
+    return o;

 }
 
 }
 

-#if wxUSE_STD_IOSTREAM
+#if wxUSE_LONGLONG_NATIVE

 
 

-// input/output
-wxSTD ostream& operator<< (wxSTD ostream& o, const wxLongLong& ll)
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxULongLong_t value)

 {
 {

-    return o << ll.ToString();
+    return o << wxULongLong(value).ToString();

 }
 
 }
 

-wxSTD ostream& operator<< (wxSTD ostream& o, const wxULongLong& ll)
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &o, wxLongLong_t value)

 {
 {

-    return o << ll.ToString();
+    return o << wxLongLong(value).ToString();

 }
 
 }
 

-#endif // wxUSE_STD_IOSTREAM
+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
 
 #endif // wxUSE_LONGLONG