X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/216a72f3b9ab2bf72f489aceac0093138a6e7707..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/longlong.cpp diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp index b8364d8579..85591bb67c 100644 --- 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 , Vadim Zeitlin // Remarks: this class is not public in wxWidgets 2.0! It is intentionally @@ -22,19 +22,19 @@ #endif #if wxUSE_LONGLONG + #include "wx/longlong.h" -#include "wx/math.h" // for fabs() -#if wxUSE_STREAMS -#include "wx/txtstrm.h" +#ifndef WX_PRECOMP + #include "wx/math.h" // for fabs() #endif -#if defined(__MWERKS__) && defined(__WXMSW__) -#include // for memset() -#else -#include // for memset() +#if wxUSE_STREAMS + #include "wx/txtstrm.h" #endif +#include // for memset() + #include "wx/ioswrap.h" // ============================================================================ @@ -190,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); @@ -1250,14 +1263,14 @@ WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wx return o << ll.ToString(); } -#define READ_STRING_CHAR(s, idx, len) ((wxChar) ((idx!=len) ? s[idx++] : 0)) +#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 length = s.length(); size_t idx = 0; wxChar ch = READ_STRING_CHAR(s, idx, length); @@ -1282,7 +1295,7 @@ WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxString s = o.ReadWord(); ll = wxLongLong(0l, 0l); - size_t length = s.Length(); + size_t length = s.length(); size_t idx = 0; wxChar ch = READ_STRING_CHAR(s, idx, length);