seconds and milliseconds in wxTimeSpan ctor should be long long, not long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1115,7 +1115,7 @@ public:
|
|||||||
// ------------------------------------------------------------------------
|
// ------------------------------------------------------------------------
|
||||||
|
|
||||||
// return the timespan for the given number of seconds
|
// return the timespan for the given number of seconds
|
||||||
static wxTimeSpan Seconds(long sec) { return wxTimeSpan(0, 0, sec); }
|
static wxTimeSpan Seconds(wxLongLong sec) { return wxTimeSpan(0, 0, sec); }
|
||||||
static wxTimeSpan Second() { return Seconds(1); }
|
static wxTimeSpan Second() { return Seconds(1); }
|
||||||
|
|
||||||
// return the timespan for the given number of minutes
|
// return the timespan for the given number of minutes
|
||||||
@@ -1142,8 +1142,8 @@ public:
|
|||||||
// milliseconds)
|
// milliseconds)
|
||||||
inline wxTimeSpan(long hours,
|
inline wxTimeSpan(long hours,
|
||||||
long minutes = 0,
|
long minutes = 0,
|
||||||
long seconds = 0,
|
wxLongLong seconds = 0,
|
||||||
long milliseconds = 0);
|
wxLongLong milliseconds = 0);
|
||||||
|
|
||||||
// default copy ctor is ok
|
// default copy ctor is ok
|
||||||
|
|
||||||
@@ -1893,8 +1893,8 @@ wxDateTime::FromTimezone(const wxDateTime::TimeZone& tz, bool noDST) const
|
|||||||
|
|
||||||
inline wxTimeSpan::wxTimeSpan(long hours,
|
inline wxTimeSpan::wxTimeSpan(long hours,
|
||||||
long minutes,
|
long minutes,
|
||||||
long seconds,
|
wxLongLong seconds,
|
||||||
long milliseconds)
|
wxLongLong milliseconds)
|
||||||
{
|
{
|
||||||
// assign first to avoid precision loss
|
// assign first to avoid precision loss
|
||||||
m_diff = hours;
|
m_diff = hours;
|
||||||
|
Reference in New Issue
Block a user