Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only use wxDateTime in wxRichTextPrintout::SubstituteKeywords() if available.

Browse Source 
Don't expand date and time fields if wxUSE_DATETIME==0.

See #16939.
This commit is contained in:
Artur Wieczorek
2015-04-05 10:16:42 +02:00
committed by Vadim Zeitlin
parent a679d0440c
commit 119e67d959
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/richtext/richtextprint.cpp
View File

@@ -427,10 +427,15 @@ bool wxRichTextPrintout::SubstituteKeywords(wxString& str, const wxString& title
num.Printf(wxT("%lu"), (unsigned long) pageCount);
str.Replace(wxT("@PAGESCNT@"), num);
#if wxUSE_DATETIME
wxDateTime now = wxDateTime::Now();
str.Replace(wxT("@DATE@"), now.FormatDate());
str.Replace(wxT("@TIME@"), now.FormatTime());
#else
str.Replace(wxT("@DATE@"), wxEmptyString);
str.Replace(wxT("@TIME@"), wxEmptyString);
#endif
str.Replace(wxT("@TITLE@"), title);