From 421388f204a5899d934bebb0152e0ce9de54d500 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 20 Jan 2012 22:11:55 +0000
Subject: [PATCH] Fix time zone in wxDateTime::UNow().

The internal wxDateTime representation is in the UTC, so use
wxGetUTCTimeMillis() in UNow(), using wxGetLocalTimeMillis() made it
inconsistent with Now() and wrong.

Really closes #13862.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt        | 1 +
 src/common/datetime.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index e3370e520f..236c2c93ef 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -453,6 +453,7 @@ All:
 - Added wxLogFormatter to allow customizing wxLog output (Sébastien Gallou).
 - Added "%z" support to wxDateTime::Format() and Parse() (Armel Asselin).
 - Add wxHTTP::SetPostBuffer(wxMemoryBuffer) and SetPostText() (Eran Ifrah).
+- Fix wrong time zone used in wxDateTime::UNow().
 
 All (GUI):
 
diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 90038a27c3..b70f3331fb 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -1102,7 +1102,7 @@ wxDateTime wxDateTime::GetEndDST(int year, Country country)
 // return the current time with ms precision
 /* static */ wxDateTime wxDateTime::UNow()
 {
-    return wxDateTime(wxGetLocalTimeMillis());
+    return wxDateTime(wxGetUTCTimeMillis());
 }
 
 // the values in the tm structure contain the local time
-- 
2.45.2