From 34f90a1cfe8b9be4451964396b062998a83fc37b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 29 Oct 2006 00:05:56 +0000
Subject: [PATCH] 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
---
 docs/latex/wx/datetime.tex | 8 ++++++--
 include/wx/datetime.h      | 8 ++++++--
 src/common/datetime.cpp    | 1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/latex/wx/datetime.tex b/docs/latex/wx/datetime.tex
index 6fc226c1d1..25b7cc0239 100644
--- a/docs/latex/wx/datetime.tex
+++ b/docs/latex/wx/datetime.tex
@@ -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
diff --git a/include/wx/datetime.h b/include/wx/datetime.h
index 15f344cbf8..8d994290ab 100644
--- a/include/wx/datetime.h
+++ b/include/wx/datetime.h
@@ -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
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 4e68a76cd2..4f1f73550a 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -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;
 
-- 
2.50.0

