projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
header files are not executable
[wxWidgets.git]
/
src
/
html
/
htmprint.cpp
diff --git
a/src/html/htmprint.cpp
b/src/html/htmprint.cpp
index f62cbc0133ceb79799eb0e21be65763cab13c565..cacbefbc60939d9025ffdb3cb90efe7c11d2e87c 100644
(file)
--- 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/dc.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
+ #include "wx/module.h"
#endif
#include "wx/print.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/html/htmprint.h"
#include "wx/wxhtml.h"
#include "wx/wfstream.h"
-#include "wx/module.h"
//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------
@@
-251,7
+251,7
@@
bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
bool wxHtmlPrintout::OnPrintPage(int page)
{
wxDC *dc = GetDC();
bool wxHtmlPrintout::OnPrintPage(int page)
{
wxDC *dc = GetDC();
- if (dc)
+ if (dc
&& dc->IsOk()
)
{
if (HasPage(page))
RenderPage(dc, page);
{
if (HasPage(page))
RenderPage(dc, page);
@@
-264,19
+264,19
@@
bool wxHtmlPrintout::OnPrintPage(int page)
void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
{
*minPage = 1;
void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
{
*minPage = 1;
- if ( m_NumPages >= (signed)m_PageBreaks.Count()-1)
+ if ( m_NumPages >= (signed)m_PageBreaks.
Get
Count()-1)
*maxPage = m_NumPages;
else
*maxPage = m_NumPages;
else
- *maxPage = (signed)m_PageBreaks.Count()-1;
+ *maxPage = (signed)m_PageBreaks.
Get
Count()-1;
*selPageFrom = 1;
*selPageFrom = 1;
- *selPageTo = (signed)m_PageBreaks.Count()-1;
+ *selPageTo = (signed)m_PageBreaks.
Get
Count()-1;
}
bool wxHtmlPrintout::HasPage(int pageNum)
{
}
bool wxHtmlPrintout::HasPage(int pageNum)
{
- return
(pageNum >= 1 && pageNum-1 <= (signed)m_PageBreaks.Count()
);
+ return
pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount(
);
}
}
@@
-374,9
+374,9
@@
void wxHtmlPrintout::CountPages()
m_PageBreaks,
pos, true, INT_MAX);
m_PageBreaks.Add( pos);
m_PageBreaks,
pos, true, INT_MAX);
m_PageBreaks.Add( pos);
- if( m_PageBreaks.Count() > wxHTML_PRINT_MAX_PAGES)
+ if( m_PageBreaks.
Get
Count() > wxHTML_PRINT_MAX_PAGES)
{
{
- wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can continue any longer!"),
+ wxMessageBox( _("HTML pagination algorithm generated more than the allowed maximum number of pages and it can
't
continue any longer!"),
_("Warning"), wxCANCEL | wxICON_ERROR );
break;
}
_("Warning"), wxCANCEL | wxICON_ERROR );
break;
}
@@
-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("%i"), page);
r.Replace(wxT("@PAGENUM@"), num);
- num.Printf(wxT("%lu"),
m_PageBreaks.Count()-1
);
+ num.Printf(wxT("%lu"),
(unsigned long)(m_PageBreaks.GetCount() - 1)
);
r.Replace(wxT("@PAGESCNT@"), num);
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;
}
return r;
}