projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sadly, direct access to SetUpDC is required for the
[wxWidgets.git]
/
include
/
wx
/
longlong.h
diff --git
a/include/wx/longlong.h
b/include/wx/longlong.h
index 5ceca3c77b012523757b8a30bd4183bd1d1ba0f7..b6cc42b479587bdb8c4e2508bbbf324dac5cc50d 100644
(file)
--- a/
include/wx/longlong.h
+++ b/
include/wx/longlong.h
@@
-140,6
+140,8
@@
public:
{ m_ll = l; return *this; }
wxLongLongNative& operator=(long l)
{ m_ll = l; return *this; }
{ m_ll = l; return *this; }
wxLongLongNative& operator=(long l)
{ m_ll = l; return *this; }
+ wxLongLongNative& operator=(unsigned int l)
+ { m_ll = l; return *this; }
wxLongLongNative& operator=(unsigned long l)
{ m_ll = l; return *this; }
#if wxUSE_LONGLONG_WX
wxLongLongNative& operator=(unsigned long l)
{ m_ll = l; return *this; }
#if wxUSE_LONGLONG_WX
@@
-375,6
+377,8
@@
public:
{ m_ll = l; return *this; }
wxULongLongNative& operator=(long l)
{ m_ll = l; return *this; }
{ m_ll = l; return *this; }
wxULongLongNative& operator=(long l)
{ m_ll = l; return *this; }
+ wxULongLongNative& operator=(unsigned int l)
+ { m_ll = l; return *this; }
wxULongLongNative& operator=(unsigned long l)
{ m_ll = l; return *this; }
wxULongLongNative& operator=(const wxLongLongNative &ll)
wxULongLongNative& operator=(unsigned long l)
{ m_ll = l; return *this; }
wxULongLongNative& operator=(const wxLongLongNative &ll)
@@
-406,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
@@
-633,6
+644,12
@@
public:
return *this;
}
return *this;
}
+
+ wxLongLongWx& operator=(unsigned int l)
+ {
+ return operator=((unsigned long)l);
+ }
+
wxLongLongWx& operator=(const class wxULongLongWx &ll);
// from double
wxLongLongWx& operator=(const class wxULongLongWx &ll);
// from double
@@
-896,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;