added wxUSE_ACTIVEX which depends on wxUSE_VARIANT and which wxUSE_MEDIACTRL depends...

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

diff --git a/include/wx/longlong.h b/include/wx/longlong.h
index 59dcd57c7441a249166e71728e4d7461a742cd4f..b6cc42b479587bdb8c4e2508bbbf324dac5cc50d 100644 (file)
--- a/include/wx/longlong.h
+++ b/include/wx/longlong.h
@@ -410,6 +410,13 @@ public:
         return wx_truncate_cast(unsigned long, m_ll);
     }
 
         return wx_truncate_cast(unsigned long, m_ll);
     }
 

+        // convert to double
+#ifdef _MSC_VER
+    double ToDouble() const { return wx_truncate_cast(double, (__int64) m_ll); }
+#else
+    double ToDouble() const { return wx_truncate_cast(double, m_ll); }
+#endif
+

     // operations
         // addition
     wxULongLongNative operator+(const wxULongLongNative& ll) const
     // operations
         // addition
     wxULongLongNative operator+(const wxULongLongNative& ll) const


@@ -906,6 +913,9 @@ public:
         return (unsigned long)m_lo;
     }
 
         return (unsigned long)m_lo;
     }
 

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

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