Derive wxScrollBar from wxScrollBarBase, plus miscellaneous

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index ea3fd1c685b19ed937218d4ed05548890155ca8c..e2b2ea79b9f9c5bc633ea364287d2581be1d172f 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -7,13 +7,13 @@
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     10.02.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LONGLONG_H
 #define _WX_LONGLONG_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "longlong.h"
 #endif
 
     #pragma interface "longlong.h"
 #endif
 


@@ -50,27 +50,40 @@
 // long", then check for specific compilers
 #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
     #define wxLongLong_t long
 // long", then check for specific compilers
 #if defined(SIZEOF_LONG) && (SIZEOF_LONG == 8)
     #define wxLongLong_t long

+    #define wxLongLongSuffix l
+    #define wxLongLongFmtSpec _T("l")

     #define wxLongLongIsLong
 #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
     #define wxLongLong_t __int64
     #define wxLongLongIsLong
 #elif (defined(__VISUALC__) && defined(__WIN32__)) || defined( __VMS__ )
     #define wxLongLong_t __int64

+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec _T("I64")

 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64
 #elif defined(__BORLANDC__) && defined(__WIN32__) && (__BORLANDC__ >= 0x520)
     #define wxLongLong_t __int64

-#elif defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8
-    #define wxLongLong_t long long
-#elif defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WXMICROWIN__)
+    #define wxLongLongSuffix i64
+    #define wxLongLongFmtSpec _T("Ld")
+#elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8)  || \
+        defined(__MINGW32__) || \
+        defined(__GNUC__) || \
+        defined(__CYGWIN__) || \
+        defined(__WXMICROWIN__) || \
+        (defined(__DJGPP__) && __DJGPP__ >= 2)

     #define wxLongLong_t long long
     #define wxLongLong_t long long

+    #define wxLongLongSuffix ll
+    #define wxLongLongFmtSpec _T("ll")

 #elif defined(__MWERKS__)
     #if __option(longlong)
         #define wxLongLong_t long long
 #elif defined(__MWERKS__)
     #if __option(longlong)
         #define wxLongLong_t long long

+        #define wxLongLongSuffix ll
+        #define wxLongLongFmtSpec _T("ll")

     #else
         #error "The 64 bit integer support in CodeWarrior has been disabled."
         #error "See the documentation on the 'longlong' pragma."
     #endif
 #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400
     #else
         #error "The 64 bit integer support in CodeWarrior has been disabled."
         #error "See the documentation on the 'longlong' pragma."
     #endif
 #elif defined(__VISAGECPP__) && __IBMCPP__ >= 400

-        #define wxLongLong_t long long
+    #define wxLongLong_t long long

 #else // no native long long type
     // both warning and pragma warning are not portable, but at least an
 #else // no native long long type
     // both warning and pragma warning are not portable, but at least an

-    // unknown pragma should never be an error - except that, actually, some
+    // 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__))
     // broken compilers don't like it, so we have to disable it in this case
     // <sigh>
 #if !(defined(__WATCOMC__) || defined(__VISAGECPP__))


@@ -83,6 +96,11 @@
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler
 
     #define wxUSE_LONGLONG_WX 1
 #endif // compiler
 

+// this macro allows to definea 64 bit constant in a portable way
+#define wxMakeLongLong(x, s) x ## s
+#define wxMakeLongLong2(x, s) wxMakeLongLong(x, s)
+#define wxLL(x) wxMakeLongLong2(x, wxLongLongSuffix)
+

 // the user may predefine wxUSE_LONGLONG_NATIVE and/or wxUSE_LONGLONG_NATIVE
 // to disable automatic testing (useful for the test program which defines
 // both classes) but by default we only use one class
 // the user may predefine wxUSE_LONGLONG_NATIVE and/or wxUSE_LONGLONG_NATIVE
 // to disable automatic testing (useful for the test program which defines
 // both classes) but by default we only use one class


@@ -126,7 +144,7 @@
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output
 // ----------------------------------------------------------------------------
 
 // we use iostream for wxLongLong output

-#include "wx/ioswrap.h"
+#include "wx/iosfwrap.h"

 
 #if wxUSE_LONGLONG_NATIVE
 
 
 #if wxUSE_LONGLONG_NATIVE
 


@@ -135,11 +153,11 @@ class WXDLLEXPORT wxLongLongNative
 public:
     // ctors
         // default ctor initializes to 0
 public:
     // ctors
         // default ctor initializes to 0

-    wxLongLongNative() { m_ll = 0; }
+    wxLongLongNative() : m_ll(0) { }

         // from long long
         // from long long

-    wxLongLongNative(wxLongLong_t ll) { m_ll = ll; }
+    wxLongLongNative(wxLongLong_t ll) : m_ll(ll) { }

         // from 2 longs
         // from 2 longs

-    wxLongLongNative(long hi, unsigned long lo)
+    wxLongLongNative(long hi, unsigned long lo) : m_ll(0)

     {
         // assign first to avoid precision loss!
         m_ll = ((wxLongLong_t) hi) << 32;
     {
         // assign first to avoid precision loss!
         m_ll = ((wxLongLong_t) hi) << 32;


@@ -208,8 +226,8 @@ public:
         { m_ll++; return *this; }
 
         // post increment
         { m_ll++; return *this; }
 
         // post increment

-    wxLongLongNative& operator++(int)
-        { m_ll++; return *this; }
+    wxLongLongNative operator++(int)
+        { wxLongLongNative value(*this); m_ll++; return value; }

 
         // negation operator
     wxLongLongNative operator-() const
 
         // negation operator
     wxLongLongNative operator-() const


@@ -232,8 +250,8 @@ public:
         { m_ll--; return *this; }
 
         // post decrement
         { m_ll--; return *this; }
 
         // post decrement

-    wxLongLongNative& operator--(int)
-        { m_ll--; return *this; }
+    wxLongLongNative operator--(int)
+        { wxLongLongNative value(*this); m_ll--; return value; }

 
     // shifts
         // left shift
 
     // shifts
         // left shift


@@ -337,11 +355,11 @@ class WXDLLEXPORT wxULongLongNative
 public:
     // ctors
         // default ctor initializes to 0
 public:
     // ctors
         // default ctor initializes to 0

-    wxULongLongNative() { m_ll = 0; }
+    wxULongLongNative() : m_ll(0) { }

         // from long long
         // from long long

-    wxULongLongNative(unsigned wxLongLong_t ll) { m_ll = ll; }
+    wxULongLongNative(unsigned wxLongLong_t ll) : m_ll(ll) { }

         // from 2 longs
         // from 2 longs

-    wxULongLongNative(unsigned long hi, unsigned long lo)
+    wxULongLongNative(unsigned long hi, unsigned long lo) : m_ll(0)

     {
         // assign first to avoid precision loss!
         m_ll = ((unsigned wxLongLong_t) hi) << 32;
     {
         // assign first to avoid precision loss!
         m_ll = ((unsigned wxLongLong_t) hi) << 32;


@@ -396,8 +414,8 @@ public:
         { m_ll++; return *this; }
 
         // post increment
         { m_ll++; return *this; }
 
         // post increment

-    wxULongLongNative& operator++(int)
-        { m_ll++; return *this; }
+    wxULongLongNative operator++(int)
+        { wxULongLongNative value(*this); m_ll++; return value; }

 
         // subtraction
     wxULongLongNative operator-(const wxULongLongNative& ll) const
 
         // subtraction
     wxULongLongNative operator-(const wxULongLongNative& ll) const


@@ -415,8 +433,8 @@ public:
         { m_ll--; return *this; }
 
         // post decrement
         { m_ll--; return *this; }
 
         // post decrement

-    wxULongLongNative& operator--(int)
-        { m_ll--; return *this; }
+    wxULongLongNative operator--(int)
+        { wxULongLongNative value(*this); m_ll--; return value; }

 
     // shifts
         // left shift
 
     // shifts
         // left shift