X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0bab435360c3c0e889dc242458d32760f4630f..4e9080bc8ea7e46bcc442037a67a08ad4efb8674:/src/html/htmprint.cpp diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp index 4625c82e89..0dd8817e52 100644 --- a/src/html/htmprint.cpp +++ b/src/html/htmprint.cpp @@ -22,6 +22,7 @@ #include "wx/intl.h" #include "wx/dc.h" #include "wx/settings.h" + #include "wx/msgdlg.h" #endif #include "wx/print.h" @@ -439,9 +440,15 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page) num.Printf(wxT("%i"), page); r.Replace(wxT("@PAGENUM@"), num); - num.Printf(wxT("%i"), 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; }