AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wxVector<int> instead of wxArrayInt in wxHtmlDCRenderer

Browse Source 
No real changes, just prefer standard-like template class to the legacy
wx one.
This commit is contained in:
Vadim Zeitlin 2018-05-24 18:11:45 +02:00
parent b9b6ccb804
commit edeca4d9d6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/html/htmprint.h
View File

@ -20,6 +20,7 @@
#include "wx/print.h"
#include "wx/printdlg.h"
#include "wx/vector.h"
#include <limits.h> // INT_MAX
@ -188,7 +189,7 @@ private:
private:
int m_NumPages;
wxArrayInt m_PageBreaks;
wxVector<int> m_PageBreaks;
wxString m_Document, m_BasePath;
bool m_BasePathIsDir;

14
src/html/htmprint.cpp
View File

@ -388,19 +388,19 @@ bool wxHtmlPrintout::OnPrintPage(int page)
void wxHtmlPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo)
{
*minPage = 1;
if ( m_NumPages >= (signed)m_PageBreaks.GetCount()-1)
if ( m_NumPages >= (signed)m_PageBreaks.size()-1)
*maxPage = m_NumPages;
else
*maxPage = (signed)m_PageBreaks.GetCount()-1;
*maxPage = (signed)m_PageBreaks.size()-1;
*selPageFrom = 1;
*selPageTo = (signed)m_PageBreaks.GetCount()-1;
*selPageTo = (signed)m_PageBreaks.size()-1;
}
bool wxHtmlPrintout::HasPage(int pageNum)
{
return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.GetCount();
return pageNum > 0 && (unsigned)pageNum < m_PageBreaks.size();
}
@ -480,11 +480,11 @@ void wxHtmlPrintout::CountPages()
m_NumPages = 0;
m_PageBreaks.Clear();
m_PageBreaks.clear();
for ( int pos = 0; pos != wxNOT_FOUND; )
{
m_PageBreaks.Add( pos);
m_PageBreaks.push_back(pos);
pos = m_Renderer.FindNextPageBreak(pos);
}
}
@ -550,7 +550,7 @@ wxString wxHtmlPrintout::TranslateHeader(const wxString& instr, int page)
num.Printf(wxT("%i"), page);
r.Replace(wxT("@PAGENUM@"), num);
num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.GetCount() - 1));
num.Printf(wxT("%lu"), (unsigned long)(m_PageBreaks.size() - 1));
r.Replace(wxT("@PAGESCNT@"), num);
#if wxUSE_DATETIME