added NZST and NZDT time zones (request 617912)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
020e2e811e
commit
34f90a1cfe
@ -43,7 +43,7 @@ Time zone symbolic names:
|
||||
GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
|
||||
GMT0,
|
||||
GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
|
||||
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
|
||||
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,
|
||||
// Note that GMT12 and GMT_12 are not the same: there is a difference
|
||||
// of exactly one day between them
|
||||
|
||||
@ -77,10 +77,14 @@ Time zone symbolic names:
|
||||
// Australia
|
||||
|
||||
A_WST = GMT8, // Western Standard Time
|
||||
A_CST = GMT12 + 1, // Central Standard Time (+9.5)
|
||||
A_CST = GMT13 + 1, // Central Standard Time (+9.5)
|
||||
A_EST = GMT10, // Eastern Standard Time
|
||||
A_ESST = GMT11, // Eastern Summer Time
|
||||
|
||||
// New Zealand
|
||||
NZST = GMT12, // Standard Time
|
||||
NZDT = GMT13, // Daylight Saving Time
|
||||
|
||||
// Universal Coordinated Time = the new and politically correct name
|
||||
// for GMT
|
||||
UTC = GMT0
|
||||
|
@ -168,7 +168,7 @@ public:
|
||||
GMT_6, GMT_5, GMT_4, GMT_3, GMT_2, GMT_1,
|
||||
GMT0,
|
||||
GMT1, GMT2, GMT3, GMT4, GMT5, GMT6,
|
||||
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12,
|
||||
GMT7, GMT8, GMT9, GMT10, GMT11, GMT12, GMT13,
|
||||
// Note that GMT12 and GMT_12 are not the same: there is a difference
|
||||
// of exactly one day between them
|
||||
|
||||
@ -202,10 +202,14 @@ public:
|
||||
// Australia
|
||||
|
||||
A_WST = GMT8, // Western Standard Time
|
||||
A_CST = GMT12 + 1, // Central Standard Time (+9.5)
|
||||
A_CST = GMT13 + 1, // Central Standard Time (+9.5)
|
||||
A_EST = GMT10, // Eastern Standard Time
|
||||
A_ESST = GMT11, // Eastern Summer Time
|
||||
|
||||
// New Zealand
|
||||
NZST = GMT12, // Standard Time
|
||||
NZDT = GMT13, // Daylight Saving Time
|
||||
|
||||
// TODO add more symbolic timezone names here
|
||||
|
||||
// Universal Coordinated Time = the new and politically correct name
|
||||
|
@ -721,6 +721,7 @@ wxDateTime::TimeZone::TimeZone(wxDateTime::TZ tz)
|
||||
case wxDateTime::GMT10:
|
||||
case wxDateTime::GMT11:
|
||||
case wxDateTime::GMT12:
|
||||
case wxDateTime::GMT13:
|
||||
m_offset = 3600*(tz - wxDateTime::GMT0);
|
||||
break;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user