X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b6da0a258d6911c74bed2113bb64e52939fa2c4..7807a2b4998ef075b5ac7c05ab48274c28b477ba:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index f62cbc0133..80fa773564 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -23,6 +23,7 @@ #include "wx/dc.h" #include "wx/settings.h" #include "wx/msgdlg.h" + #include "wx/module.h" #endif #include "wx/print.h" @@ -30,7 +31,6 @@ #include "wx/html/htmprint.h" #include "wx/wxhtml.h" #include "wx/wfstream.h" -#include "wx/module.h" //-------------------------------------------------------------------------------- @@ -440,9 +440,15 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page) num.Printf(wxT("%i"), page); r.Replace(wxT("@PAGENUM@"), num); - num.Printf(wxT("%lu"), m_PageBreaks.Count()-1); + num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.Count() - 1)); r.Replace(wxT("@PAGESCNT@"), num); + const wxDateTime now = wxDateTime::Now(); + r.Replace(wxT("@DATE@"), now.FormatDate()); + r.Replace(wxT("@TIME@"), now.FormatTime()); + + r.Replace(wxT("@TITLE@"), GetTitle()); + return r; }