Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -586,10 +586,22 @@ public:
|
||||
wxDateTime ToTimezone(const wxDateTime::TimeZone& tz, bool noDST = false);
|
||||
wxDateTime& MakeTimezone(const wxDateTime::TimeZone& tz, bool noDST = false);
|
||||
|
||||
// transform to GMT/UTC
|
||||
wxDateTime ToGMT(bool noDST = false);
|
||||
// interpret current value as being in another timezone and transform
|
||||
// it to local one
|
||||
wxDateTime FromTimezone(const wxDateTime::TimeZone& tz, bool noDST = false) const;
|
||||
wxDateTime& MakeFromTimezone(const wxDateTime::TimeZone& tz, bool noDST = false);
|
||||
|
||||
// transform to/from GMT/UTC
|
||||
wxDateTime ToUTC(bool noDST = false) const;
|
||||
wxDateTime& MakeUTC(bool noDST = false);
|
||||
|
||||
wxDateTime ToGMT(bool noDST = false) const;
|
||||
wxDateTime& MakeGMT(bool noDST = false);
|
||||
|
||||
wxDateTime FromUTC(bool noDST = false) const;
|
||||
wxDateTime& MakeFromUTC(bool noDST = false);
|
||||
|
||||
|
||||
// is daylight savings time in effect at this moment according to the
|
||||
// rules of the specified country?
|
||||
//
|
||||
|
Reference in New Issue
Block a user