fixing osx_cocoa

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

diff --git a/src/common/longlong.cpp b/src/common/longlong.cpp
index 772ecc0b9a600e57d6919b1eaf3bc7aae6c68ff3..1ceefe012303c0677d29e8b557b4face30673d26 100644 (file)
--- a/src/common/longlong.cpp
+++ b/src/common/longlong.cpp
@@ -33,11 +33,7 @@
     #include "wx/txtstrm.h"
 #endif
 
     #include "wx/txtstrm.h"
 #endif
 

-#if defined(__MWERKS__) && defined(__WXMSW__)
-    #include <string.h>     // for memset()
-#else
-    #include <memory.h>     // for memset()
-#endif
+#include <string.h>            // for memset()

 
 #include "wx/ioswrap.h"
 
 
 #include "wx/ioswrap.h"
 


@@ -137,6 +133,22 @@ wxULongLongNative& wxULongLongNative::operator=(const class wxULongLongWx &ll)
 }
 #endif
 
 }
 #endif
 

+#ifdef __VISUALC6__
+double wxULongLongNative::ToDouble() const
+{
+    // Work around the problem of casting unsigned __int64 to double in VC6
+    // (which for unknown reasons only manifests itself in DLL builds, i.e.
+    // when using /MD).
+    static const __int64 int64_t_max = 9223372036854775807i64;
+    if ( m_ll <= int64_t_max )
+        return wx_truncate_cast(double, (wxLongLong_t)m_ll);
+
+    double d = wx_truncate_cast(double, int64_t_max);
+    d += (__int64)(m_ll - int64_t_max - 1); // The cast is safe because of -1
+    return d + 1;
+}
+#endif // __VISUALC6__
+

 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================
 #endif // wxUSE_LONGLONG_NATIVE
 
 // ============================================================================


@@ -1176,7 +1188,7 @@ void *wxULongLongWx::asArray(void) const
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \

-                result.Prepend((wxChar)(_T('0') - digit));           \
+                result.Prepend((wxChar)(wxT('0') - digit));          \

                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                 ll /= 10;                                            \
             }                                                        \
         }                                                            \


@@ -1185,15 +1197,15 @@ void *wxULongLongWx::asArray(void) const
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \
             while ( ll != 0 )                                        \
             {                                                        \
                 long digit = (ll % 10).ToLong();                     \

-                result.Prepend((wxChar)(_T('0') + digit));           \
+                result.Prepend((wxChar)(wxT('0') + digit));          \

                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \
                 ll /= 10;                                            \
             }                                                        \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \

-            result = _T('0');                                        \
+            result = wxT('0');                                       \

         else if ( neg )                                              \
         else if ( neg )                                              \

-            result.Prepend(_T('-'));                                 \
+            result.Prepend(wxT('-'));                                \

                                                                      \
         return result;                                               \
     }
                                                                      \
         return result;                                               \
     }


@@ -1208,12 +1220,12 @@ void *wxULongLongWx::asArray(void) const
                                                                      \
         while ( ll != 0 )                                            \
         {                                                            \
                                                                      \
         while ( ll != 0 )                                            \
         {                                                            \

-            result.Prepend((wxChar)(_T('0') + (ll % 10).ToULong())); \
+            result.Prepend((wxChar)(wxT('0') + (ll % 10).ToULong())); \

             ll /= 10;                                                \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \
             ll /= 10;                                                \
         }                                                            \
                                                                      \
         if ( result.empty() )                                        \

-            result = _T('0');                                        \
+            result = wxT('0');                                       \

                                                                      \
         return result;                                               \
     }
                                                                      \
         return result;                                               \
     }


@@ -1267,7 +1279,7 @@ WXDLLIMPEXP_BASE wxTextOutputStream& operator<< (wxTextOutputStream& o, const wx
     return o << ll.ToString();
 }
 
     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++] : wxT('\0'))

 
 WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
 {
 
 WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &o, wxULongLong &ll)
 {