From d55f17dea8734cfb458fd8fcbac684d141b181af Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 16:19:57 +0000 Subject: various quirks during MS_DB_TIME_TIMESTAMPTOSTRINGT calls git-svn-id: http://svn.miranda-ng.org/main/trunk@14265 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/ctrl_tzcombo.cpp | 20 ++------------------ plugins/UserInfoEx/src/ctrl_tzcombo.h | 2 +- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'plugins/UserInfoEx') diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp index ab1fc0064c..7159718a51 100644 --- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp +++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp @@ -273,23 +273,7 @@ void CTzCombo::OnChangedByUser(WORD wChangedMsg) * * @return nothing **/ -void CTzCombo::GetTime(LPTSTR szTime, WORD cchTime) +void CTzCombo::GetTime(LPTSTR szTime, int cchTime) { - //use new core tz interface - if (tmi.printDateTime) { - tmi.printDateTime((HANDLE)ComboBox_GetItemData(_hwnd, _curSel), _T("t"), szTime, cchTime, 0); - } - //fallback use old UIEX method - else { - const CTimeZone *pTimeZone = (CTimeZone*)ComboBox_GetItemData(_hwnd, _curSel); - if (PtrIsValid(pTimeZone)) { - MTime now; - TIME_ZONE_INFORMATION tzi = *pTimeZone; - - now.GetTimeUTC(); - now.UTCToTzSpecificLocal(&tzi); - now.TimeFormat(szTime, cchTime); - } - else mir_tstrcpy(szTime, _T("--:--")); - } + tmi.printDateTime((HANDLE)ComboBox_GetItemData(_hwnd, _curSel), _T("t"), szTime, cchTime, 0); } diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.h b/plugins/UserInfoEx/src/ctrl_tzcombo.h index 08e5ef092d..4402a54375 100644 --- a/plugins/UserInfoEx/src/ctrl_tzcombo.h +++ b/plugins/UserInfoEx/src/ctrl_tzcombo.h @@ -50,7 +50,7 @@ public: virtual void OnApply(MCONTACT hContact, LPCSTR pszProto); virtual void OnChangedByUser(WORD wChangedMsg); - void GetTime(LPTSTR szTime, WORD cchTime); + void GetTime(LPTSTR szTime, int cchTime); }; #endif /* _UI_CTRL_TZ_COMBO_INCLUDE_ */ \ No newline at end of file -- cgit v1.2.3