Ryan's cumulative wxActiveX and media control patch (1427775)

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index a318c78a2b6b0237759f873833330e1e9fedd235..0fdf22973ab25d62e6c88932c991ac2043e4dcd5 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -151,7 +151,7 @@ public:
         // 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),
@@ -160,10 +160,8 @@ public:
         return wx_truncate_cast(long, m_ll);
     }
 
-#if wxABI_VERSION >= 20602
         // convert to double
     double ToDouble() const { return wx_truncate_cast(double, m_ll); }
-#endif // ABI >= 2.6.2
 
     // don't provide implicit conversion to wxLongLong_t or we will have an
     // ambiguity for all arithmetic operations
@@ -352,7 +350,7 @@ public:
         // 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,
@@ -582,7 +580,7 @@ public:
         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),
@@ -591,10 +589,8 @@ public:
         return (long)m_lo;
     }
 
-#if wxABI_VERSION >= 20602
         // convert to double
     double ToDouble() const;
-#endif // ABI >= 2.6.2
 
     // operations
         // addition
@@ -782,7 +778,7 @@ public:
         // 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,