From 3f562374f11048ff0005b7229683b3804d2208d2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 17 Dec 2001 01:05:37 +0000 Subject: [PATCH] added __TDATE__ and __TTIME__ and use them instead of __DATE__ and __TIME__ for Unicode-friendliness git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/log.h | 5 ----- include/wx/wxchar.h | 12 +++++++++++- src/common/wincmn.cpp | 11 ++++++++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/include/wx/log.h b/include/wx/log.h index b6b3a64592..d7d62303dc 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -543,11 +543,6 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode); // debug only logging functions: use them with API name and error code // ---------------------------------------------------------------------------- -#ifndef __TFILE__ - #define __XFILE__(x) Tx) - #define __TFILE__ __XFILE__(__FILE__) -#endif - #ifdef __WXDEBUG__ // make life easier for people using VC++ IDE: clicking on the message // will take us immediately to the place of the failed API diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h index 7d49daf7c0..1174ddb287 100644 --- a/include/wx/wxchar.h +++ b/include/wx/wxchar.h @@ -674,12 +674,22 @@ WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const // and _() in wxWindows sources #define wxT(x) _T(x) -// a Unicode-friendly __FILE__ analog +// Unicode-friendly __FILE__, __DATE__ and __TIME__ analogs #ifndef __TFILE__ #define __XFILE__(x) wxT(x) #define __TFILE__ __XFILE__(__FILE__) #endif +#ifndef __TDATE__ + #define __XDATE__(x) wxT(x) + #define __TDATE__ __XDATE__(__DATE__) +#endif + +#ifndef __TTIME__ + #define __XTIME__(x) wxT(x) + #define __TTIME__ __XTIME__(__TIME__) +#endif + #endif //_WX_WXCHAR_H_ diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 0669e82bd1..5b677218c7 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -1538,14 +1538,19 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(wxString::Format( _T( - " wxWindows Library (%s port)\nVersion %u.%u.%u, compiled at %s %s\n Copyright (c) 1995-2001 wxWindows team" + " wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n Copyright (c) 1995-2001 wxWindows team" ), port.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER, - __DATE__, - __TIME__ +#if wxUSE_UNICODE + L" (Unicode)", +#else + "", +#endif + __TDATE__, + __TTIME__ ), _T("wxWindows information"), wxICON_INFORMATION | wxOK, -- 2.45.2