Build fix after recent changes in wxRendererNative class.

[wxWidgets.git] / include / wx / longlong.h

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 5670a66fab343e250545fa229a55ba15ef407759..5ceca3c77b012523757b8a30bd4183bd1d1ba0f7 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -13,11 +13,10 @@
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "longlong.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/defs.h"

+
+#if wxUSE_LONGLONG
+

 #include "wx/string.h"
 
 #include <limits.h>     // for LONG_MAX
 #include "wx/string.h"
 
 #include <limits.h>     // for LONG_MAX


@@ -43,7 +42,12 @@
     // unknown pragma should never be an error -- except that, actually, some
     // broken compilers don't like it, so we have to disable it in this case
     // <sigh>
     // unknown pragma should never be an error -- except that, actually, some
     // broken compilers don't like it, so we have to disable it in this case
     // <sigh>

-    #if !(defined(__WATCOMC__) || defined(__VISAGECPP__))
+    #ifdef __GNUC__
+        #warning "Your compiler does not appear to support 64 bit "\
+                 "integers, using emulation class instead.\n" \
+                 "Please report your compiler version to " \
+                 "wx-dev@lists.wxwidgets.org!"
+    #elif !(defined(__WATCOMC__) || defined(__VISAGECPP__))

         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \
         #pragma warning "Your compiler does not appear to support 64 bit "\
                         "integers, using emulation class instead.\n" \
                         "Please report your compiler version to " \


@@ -125,10 +129,22 @@ public:
 
     // assignment operators
         // from native 64 bit integer
 
     // assignment operators
         // from native 64 bit integer

+#ifndef wxLongLongIsLong

     wxLongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }
     wxLongLongNative& operator=(wxLongLong_t ll)
         { m_ll = ll; return *this; }

+    wxLongLongNative& operator=(wxULongLong_t ll)
+        { m_ll = ll; return *this; }
+#endif // !wxLongLongNative
+    wxLongLongNative& operator=(const wxULongLongNative &ll);
+    wxLongLongNative& operator=(int l)
+        { m_ll = l; return *this; }
+    wxLongLongNative& operator=(long l)
+        { m_ll = l; return *this; }
+    wxLongLongNative& operator=(unsigned long l)
+        { m_ll = l; return *this; }

 #if wxUSE_LONGLONG_WX
     wxLongLongNative& operator=(wxLongLongWx ll);
 #if wxUSE_LONGLONG_WX
     wxLongLongNative& operator=(wxLongLongWx ll);

+    wxLongLongNative& operator=(const class wxULongLongWx &ll);

 #endif
 
 
 #endif
 
 


@@ -143,10 +159,10 @@ public:
     // accessors
         // get high part
     long GetHi() const
     // accessors
         // get high part
     long GetHi() const

-        { return (long)(m_ll >> 32); }
+        { return wx_truncate_cast(long, m_ll >> 32); }

         // get low part
     unsigned long GetLo() const
         // get low part
     unsigned long GetLo() const

-        { return (unsigned long)m_ll; }
+        { return wx_truncate_cast(unsigned long, m_ll); }

 
         // get absolute value
     wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); }
 
         // get absolute value
     wxLongLongNative Abs() const { return wxLongLongNative(*this).Abs(); }


@@ -155,15 +171,18 @@ public:
         // convert to native long long
     wxLongLong_t GetValue() const { return m_ll; }
 
         // convert to native long long
     wxLongLong_t GetValue() const { return m_ll; }
 

-        // convert to long with range checking in the debug mode (only!)
+        // convert to long with range checking in debug mode (only!)

     long ToLong() const
     {
         wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
                       _T("wxLongLong to long conversion loss of precision") );
 
     long ToLong() const
     {
         wxASSERT_MSG( (m_ll >= LONG_MIN) && (m_ll <= LONG_MAX),
                       _T("wxLongLong to long conversion loss of precision") );
 

-        return (long)m_ll;
+        return wx_truncate_cast(long, m_ll);

     }
 
     }
 

+        // convert to double
+    double ToDouble() const { return wx_truncate_cast(double, m_ll); }
+

     // don't provide implicit conversion to wxLongLong_t or we will have an
     // ambiguity for all arithmetic operations
     //operator wxLongLong_t() const { return m_ll; }
     // don't provide implicit conversion to wxLongLong_t or we will have an
     // ambiguity for all arithmetic operations
     //operator wxLongLong_t() const { return m_ll; }


@@ -215,13 +234,13 @@ public:
     // shifts
         // left shift
     wxLongLongNative operator<<(int shift) const
     // shifts
         // left shift
     wxLongLongNative operator<<(int shift) const

-        { return wxLongLongNative(m_ll << shift);; }
+        { return wxLongLongNative(m_ll << shift); }

     wxLongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxLongLongNative operator>>(int shift) const
     wxLongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxLongLongNative operator>>(int shift) const

-        { return wxLongLongNative(m_ll >> shift);; }
+        { return wxLongLongNative(m_ll >> shift); }

     wxLongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 
     wxLongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 


@@ -308,6 +327,13 @@ public:
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxLongLongNative&);
 
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxLongLongNative&);
 

+#if wxUSE_STREAMS
+    friend WXDLLIMPEXP_BASE
+    class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongNative&);
+#endif
+

 private:
     wxLongLong_t  m_ll;
 };
 private:
     wxLongLong_t  m_ll;
 };


@@ -329,35 +355,55 @@ public:
         m_ll |= (wxULongLong_t) lo;
     }
 
         m_ll |= (wxULongLong_t) lo;
     }
 

+#if wxUSE_LONGLONG_WX
+    wxULongLongNative(const class wxULongLongWx &ll);
+#endif
+

     // default copy ctor is ok
 
     // no dtor
 
     // assignment operators
         // from native 64 bit integer
     // default copy ctor is ok
 
     // no dtor
 
     // assignment operators
         // from native 64 bit integer

+#ifndef wxLongLongIsLong

     wxULongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }
     wxULongLongNative& operator=(wxULongLong_t ll)
         { m_ll = ll; return *this; }

+    wxULongLongNative& operator=(wxLongLong_t ll)
+        { m_ll = ll; return *this; }
+#endif // !wxLongLongNative
+    wxULongLongNative& operator=(int l)
+        { m_ll = l; return *this; }
+    wxULongLongNative& operator=(long l)
+        { m_ll = l; return *this; }
+    wxULongLongNative& operator=(unsigned long l)
+        { m_ll = l; return *this; }
+    wxULongLongNative& operator=(const wxLongLongNative &ll)
+        { m_ll = ll.GetValue(); return *this; }
+#if wxUSE_LONGLONG_WX
+    wxULongLongNative& operator=(wxLongLongWx ll);
+    wxULongLongNative& operator=(const class wxULongLongWx &ll);
+#endif

 
     // assignment operators from wxULongLongNative is ok
 
     // accessors
         // get high part
     unsigned long GetHi() const
 
     // assignment operators from wxULongLongNative is ok
 
     // accessors
         // get high part
     unsigned long GetHi() const

-        { return (unsigned long)(m_ll >> 32); }
+        { return wx_truncate_cast(unsigned long, m_ll >> 32); }

         // get low part
     unsigned long GetLo() const
         // get low part
     unsigned long GetLo() const

-        { return (unsigned long)m_ll; }
+        { return wx_truncate_cast(unsigned long, m_ll); }

 
         // convert to native ulong long
     wxULongLong_t GetValue() const { return m_ll; }
 
 
         // convert to native ulong long
     wxULongLong_t GetValue() const { return m_ll; }
 

-        // convert to ulong with range checking in the debug mode (only!)
+        // convert to ulong with range checking in debug mode (only!)

     unsigned long ToULong() const
     {
         wxASSERT_MSG( m_ll <= LONG_MAX,
                       _T("wxULongLong to long conversion loss of precision") );
 
     unsigned long ToULong() const
     {
         wxASSERT_MSG( m_ll <= LONG_MAX,
                       _T("wxULongLong to long conversion loss of precision") );
 

-        return (unsigned long)m_ll;
+        return wx_truncate_cast(unsigned long, m_ll);

     }
 
     // operations
     }
 
     // operations


@@ -402,13 +448,13 @@ public:
     // shifts
         // left shift
     wxULongLongNative operator<<(int shift) const
     // shifts
         // left shift
     wxULongLongNative operator<<(int shift) const

-        { return wxULongLongNative(m_ll << shift);; }
+        { return wxULongLongNative(m_ll << shift); }

     wxULongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxULongLongNative operator>>(int shift) const
     wxULongLongNative& operator<<=(int shift)
         { m_ll <<= shift; return *this; }
 
         // right shift
     wxULongLongNative operator>>(int shift) const

-        { return wxULongLongNative(m_ll >> shift);; }
+        { return wxULongLongNative(m_ll >> shift); }

     wxULongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 
     wxULongLongNative& operator>>=(int shift)
         { m_ll >>= shift; return *this; }
 


@@ -495,10 +541,24 @@ public:
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxULongLongNative&);
 
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxULongLongNative&);
 

+#if wxUSE_STREAMS
+    friend WXDLLIMPEXP_BASE
+    class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongNative&);
+    friend WXDLLIMPEXP_BASE
+    class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongNative&);
+#endif
+

 private:
     wxULongLong_t  m_ll;
 };
 
 private:
     wxULongLong_t  m_ll;
 };
 

+inline
+wxLongLongNative& wxLongLongNative::operator=(const wxULongLongNative &ll)
+{
+    m_ll = ll.GetValue();
+    return *this;
+}
+

 #endif // wxUSE_LONGLONG_NATIVE
 
 #if wxUSE_LONGLONG_WX
 #endif // wxUSE_LONGLONG_NATIVE
 
 #if wxUSE_LONGLONG_WX


@@ -554,7 +614,28 @@ public:
 
         return *this;
     }
 
         return *this;
     }

-        // from double
+        // from int
+    wxLongLongWx& operator=(int l)
+    {
+        return operator=((long)l);
+    }
+
+    wxLongLongWx& operator=(unsigned long l)
+    {
+        m_lo = l;
+        m_hi = 0;
+
+#ifdef wxLONGLONG_TEST_MODE
+        m_ll = l;
+
+        Check();
+#endif // wxLONGLONG_TEST_MODE
+
+        return *this;
+    }
+    wxLongLongWx& operator=(const class wxULongLongWx &ll);
+
+    // from double

     wxLongLongWx& Assign(double d);
         // can't have assignment operator from 2 longs
 
     wxLongLongWx& Assign(double d);
         // can't have assignment operator from 2 longs
 


@@ -581,7 +662,7 @@ public:
         return *this;
     }
 
         return *this;
     }
 

-        // convert to long with range checking in the debug mode (only!)
+        // convert to long with range checking in debug mode (only!)

     long ToLong() const
     {
         wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l),
     long ToLong() const
     {
         wxASSERT_MSG( (m_hi == 0l) || (m_hi == -1l),


@@ -590,6 +671,9 @@ public:
         return (long)m_lo;
     }
 
         return (long)m_lo;
     }
 

+        // convert to double
+    double ToDouble() const;
+

     // operations
         // addition
     wxLongLongWx operator+(const wxLongLongWx& ll) const;
     // operations
         // addition
     wxLongLongWx operator+(const wxLongLongWx& ll) const;


@@ -691,6 +775,13 @@ public:
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxLongLongWx&);
 
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxLongLongWx&);
 

+#if wxUSE_STREAMS
+    friend WXDLLIMPEXP_BASE
+    class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxLongLongWx&);
+    friend WXDLLIMPEXP_BASE
+    class wxTextInputStream& operator>>(class wxTextInputStream&, wxLongLongWx&);
+#endif
+

 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 


@@ -767,6 +858,26 @@ public:
 
         return *this;
     }
 
         return *this;
     }

+    wxULongLongWx& operator=(long l)
+    {
+        m_lo = l;
+        m_hi = (unsigned long) ((l<0) ? -1l : 0);
+
+#ifdef wxLONGLONG_TEST_MODE
+        m_ll = (wxULongLong_t) (wxLongLong_t) l;
+
+        Check();
+#endif // wxLONGLONG_TEST_MODE
+
+        return *this;
+    }
+    wxULongLongWx& operator=(const class wxLongLongWx &ll) {
+        // Should we use an assert like it was before in the constructor?
+        // wxASSERT(ll.GetHi() >= 0);
+        m_hi = (unsigned long)ll.GetHi();
+        m_lo = ll.GetLo();
+        return *this;
+    }

 
     // can't have assignment operator from 2 longs
 
 
     // can't have assignment operator from 2 longs
 


@@ -776,7 +887,7 @@ public:
         // get low part
     unsigned long GetLo() const { return m_lo; }
 
         // get low part
     unsigned long GetLo() const { return m_lo; }
 

-        // convert to long with range checking in the debug mode (only!)
+        // convert to long with range checking in debug mode (only!)

     unsigned long ToULong() const
     {
         wxASSERT_MSG( m_hi == 0ul,
     unsigned long ToULong() const
     {
         wxASSERT_MSG( m_hi == 0ul,


@@ -798,7 +909,7 @@ public:
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 
         // post increment operator
     wxULongLongWx& operator++(int) { return ++(*this); }
 

-        // substraction
+        // subtraction

     wxLongLongWx operator-(const wxULongLongWx& ll) const;
     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 
     wxLongLongWx operator-(const wxULongLongWx& ll) const;
     wxULongLongWx& operator-=(const wxULongLongWx& ll);
 


@@ -877,6 +988,13 @@ public:
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxULongLongWx&);
 
     friend WXDLLIMPEXP_BASE
     wxString& operator<<(wxString&, const wxULongLongWx&);
 

+#if wxUSE_STREAMS
+    friend WXDLLIMPEXP_BASE
+    class wxTextOutputStream& operator<<(class wxTextOutputStream&, const wxULongLongWx&);
+    friend WXDLLIMPEXP_BASE
+    class wxTextInputStream& operator>>(class wxTextInputStream&, wxULongLongWx&);
+#endif
+

 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 
 private:
     // long is at least 32 bits, so represent our 64bit number as 2 longs
 


@@ -927,4 +1045,16 @@ inline wxLongLong operator-(unsigned long l, const wxULongLong& ull)
     return wxLongLong((long)ret.GetHi(),ret.GetLo());
 }
 
     return wxLongLong((long)ret.GetHi(),ret.GetLo());
 }
 

+#if wxUSE_LONGLONG_NATIVE && wxUSE_STREAMS
+
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxULongLong_t value);
+WXDLLIMPEXP_BASE class wxTextOutputStream &operator<<(class wxTextOutputStream &stream, wxLongLong_t value);
+
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxULongLong_t &value);
+WXDLLIMPEXP_BASE class wxTextInputStream &operator>>(class wxTextInputStream &stream, wxLongLong_t &value);
+
+#endif
+
+#endif // wxUSE_LONGLONG
+

 #endif // _WX_LONGLONG_H
 #endif // _WX_LONGLONG_H