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

wxHTML src code indentation now conforms (more) to wxWin coding style

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-11-05 14:59:59 +00:00
parent 1da7aa8c4a
commit 4f9297b0ee
23 changed files with 1437 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
src/html/htmprint.cpp
View File

@@ -47,7 +47,7 @@ wxHtmlDCRenderer::wxHtmlDCRenderer() : wxObject()
m_Cells = NULL;
m_Parser = new wxHtmlWinParser(NULL);
m_FS = new wxFileSystem();
m_Parser -> SetFS(m_FS);
m_Parser->SetFS(m_FS);
}
@@ -64,7 +64,7 @@ wxHtmlDCRenderer::~wxHtmlDCRenderer()
void wxHtmlDCRenderer::SetDC(wxDC *dc, double pixel_scale)
{
m_DC = dc;
m_Parser -> SetDC(m_DC, pixel_scale);
m_Parser->SetDC(m_DC, pixel_scale);
}
@@ -83,10 +83,10 @@ void wxHtmlDCRenderer::SetHtmlText(const wxString& html, const wxString& basepat
if (m_Cells != NULL) delete m_Cells;
m_FS -> ChangePathTo(basepath, isdir);
m_Cells = (wxHtmlContainerCell*) m_Parser -> Parse(html);
m_Cells -> SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
m_Cells -> Layout(m_Width);
m_FS->ChangePathTo(basepath, isdir);
m_Cells = (wxHtmlContainerCell*) m_Parser->Parse(html);
m_Cells->SetIndent(0, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
m_Cells->Layout(m_Width);
}
@@ -98,20 +98,21 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render)
if (m_Cells == NULL || m_DC == NULL) return 0;
pbreak = (int)(from + m_Height);
while (m_Cells -> AdjustPagebreak(&pbreak)) {}
while (m_Cells->AdjustPagebreak(&pbreak)) {}
hght = pbreak - from;
if (!dont_render) {
m_DC -> SetBrush(*wxWHITE_BRUSH);
if (!dont_render)
{
m_DC->SetBrush(*wxWHITE_BRUSH);
m_DC -> SetClippingRegion(x, y, m_Width, hght);
m_Cells -> Draw(*m_DC,
m_DC->SetClippingRegion(x, y, m_Width, hght);
m_Cells->Draw(*m_DC,
x, (y - from),
y, pbreak + (y /*- from*/));
m_DC -> DestroyClippingRegion();
m_DC->DestroyClippingRegion();
}
if (pbreak < m_Cells -> GetHeight()) return pbreak;
if (pbreak < m_Cells->GetHeight()) return pbreak;
else return GetTotalHeight();
}
@@ -119,7 +120,7 @@ int wxHtmlDCRenderer::Render(int x, int y, int from, int dont_render)
int wxHtmlDCRenderer::GetTotalHeight()
{
if (m_Cells) return m_Cells -> GetHeight();
if (m_Cells) return m_Cells->GetHeight();
else return 0;
}
@@ -184,41 +185,45 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
GetPPIScreen(&ppiScreenX, &ppiScreenY);
wxDisplaySize(&scr_w, &scr_h);
GetDC() -> GetSize(&dc_w, &dc_h);
GetDC()->GetSize(&dc_w, &dc_h);
GetDC() -> SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
GetDC()->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
/* prepare headers/footers renderer: */
m_RendererHdr -> SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
m_RendererHdr -> SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
m_RendererHdr->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
m_RendererHdr->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom)));
if (m_Headers[0] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Headers[0], 1));
m_HeaderHeight = m_RendererHdr -> GetTotalHeight();
if (m_Headers[0] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[0], 1));
m_HeaderHeight = m_RendererHdr->GetTotalHeight();
}
else if (m_Headers[1] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Headers[1], 1));
m_HeaderHeight = m_RendererHdr -> GetTotalHeight();
else if (m_Headers[1] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[1], 1));
m_HeaderHeight = m_RendererHdr->GetTotalHeight();
}
if (m_Footers[0] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[0], 1));
m_FooterHeight = m_RendererHdr -> GetTotalHeight();
if (m_Footers[0] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[0], 1));
m_FooterHeight = m_RendererHdr->GetTotalHeight();
}
else if (m_Footers[1] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[1], 1));
m_FooterHeight = m_RendererHdr -> GetTotalHeight();
else if (m_Footers[1] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[1], 1));
m_FooterHeight = m_RendererHdr->GetTotalHeight();
}
/* prepare main renderer: */
m_Renderer -> SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
m_Renderer -> SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
m_Renderer->SetDC(GetDC(), (double)ppiPrinterY / (double)ppiScreenY);
m_Renderer->SetSize((int) (ppmm_h * (mm_w - m_MarginLeft - m_MarginTop)),
(int) (ppmm_v * (mm_h - m_MarginTop - m_MarginBottom) -
m_FooterHeight - m_HeaderHeight -
((m_HeaderHeight == 0) ? 0 : m_MarginSpace * ppmm_v) -
((m_FooterHeight == 0) ? 0 : m_MarginSpace * ppmm_v)
));
m_Renderer -> SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
m_Renderer->SetHtmlText(m_Document, m_BasePath, m_BasePathIsDir);
CountPages();
return TRUE;
}
@@ -227,12 +232,13 @@ bool wxHtmlPrintout::OnBeginDocument(int startPage, int endPage)
bool wxHtmlPrintout::OnPrintPage(int page)
{
wxDC *dc = GetDC();
if (dc) {
if (dc)
{
if (HasPage(page))
RenderPage(dc, page);
return TRUE;
} else
return FALSE;
}
else return FALSE;
}
@@ -273,10 +279,10 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
return;
}
wxInputStream *st = ff -> GetStream();
char *t = new char[st -> GetSize() + 1];
st -> Read(t, st -> GetSize());
t[st -> GetSize()] = 0;
wxInputStream *st = ff->GetStream();
char *t = new char[st->GetSize() + 1];
st->Read(t, st->GetSize());
t[st->GetSize()] = 0;
wxString doc = wxString(t);
delete t;
@@ -323,12 +329,13 @@ void wxHtmlPrintout::CountPages()
m_NumPages = 0;
m_PageBreaks[0] = 0;
do {
pos = m_Renderer -> Render((int)( ppmm_h * m_MarginLeft),
do
{
pos = m_Renderer->Render((int)( ppmm_h * m_MarginLeft),
(int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
pos, TRUE);
m_PageBreaks[++m_NumPages] = pos;
} while (pos < m_Renderer -> GetTotalHeight());
} while (pos < m_Renderer->GetTotalHeight());
}
@@ -345,31 +352,33 @@ void wxHtmlPrintout::RenderPage(wxDC *dc, int page)
ppmm_h = (float)pageWidth / mm_w;
ppmm_v = (float)pageHeight / mm_h;
wxDisplaySize(&scr_w, &scr_h);
dc -> GetSize(&dc_w, &dc_h);
dc->GetSize(&dc_w, &dc_h);
int ppiPrinterX, ppiPrinterY;
GetPPIPrinter(&ppiPrinterX, &ppiPrinterY);
int ppiScreenX, ppiScreenY;
GetPPIScreen(&ppiScreenX, &ppiScreenY);
dc -> SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
dc->SetUserScale((double)dc_w / (double)pageWidth, (double)dc_w / (double)pageWidth);
m_Renderer -> SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
m_Renderer->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
dc -> SetBackgroundMode(wxTRANSPARENT);
dc->SetBackgroundMode(wxTRANSPARENT);
m_Renderer -> Render((int) (ppmm_h * m_MarginLeft),
m_Renderer->Render((int) (ppmm_h * m_MarginLeft),
(int) (ppmm_v * (m_MarginTop + (m_HeaderHeight == 0 ? 0 : m_MarginSpace)) + m_HeaderHeight),
m_PageBreaks[page-1]);
m_RendererHdr -> SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
if (m_Headers[page % 2] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
m_RendererHdr -> Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop));
m_RendererHdr->SetDC(dc, (double)ppiPrinterY / (double)ppiScreenY);
if (m_Headers[page % 2] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Headers[page % 2], page));
m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (ppmm_v * m_MarginTop));
}
if (m_Footers[page % 2] != wxEmptyString) {
m_RendererHdr -> SetHtmlText(TranslateHeader(m_Footers[page % 2], page));
m_RendererHdr -> Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight));
if (m_Footers[page % 2] != wxEmptyString)
{
m_RendererHdr->SetHtmlText(TranslateHeader(m_Footers[page % 2], page));
m_RendererHdr->Render((int) (ppmm_h * m_MarginLeft), (int) (pageHeight - ppmm_v * m_MarginBottom - m_FooterHeight));
}
}
@@ -421,9 +430,9 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxFrame *parent_fra
m_PageSetupData = new wxPageSetupDialogData;
m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
m_PageSetupData -> EnableMargins(TRUE);
m_PageSetupData -> SetMarginTopLeft(wxPoint(25, 25));
m_PageSetupData -> SetMarginBottomRight(wxPoint(25, 25));
m_PageSetupData->EnableMargins(TRUE);
m_PageSetupData->SetMarginTopLeft(wxPoint(25, 25));
m_PageSetupData->SetMarginBottomRight(wxPoint(25, 25));
}
@@ -439,9 +448,9 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
{
wxHtmlPrintout *p1 = CreatePrintout();
p1 -> SetHtmlFile(htmlfile);
p1->SetHtmlFile(htmlfile);
wxHtmlPrintout *p2 = CreatePrintout();
p2 -> SetHtmlFile(htmlfile);
p2->SetHtmlFile(htmlfile);
return DoPreview(p1, p2);
}
@@ -450,9 +459,9 @@ bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
bool wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath)
{
wxHtmlPrintout *p1 = CreatePrintout();
p1 -> SetHtmlText(htmltext, basepath, TRUE);
p1->SetHtmlText(htmltext, basepath, TRUE);
wxHtmlPrintout *p2 = CreatePrintout();
p2 -> SetHtmlText(htmltext, basepath, TRUE);
p2->SetHtmlText(htmltext, basepath, TRUE);
return DoPreview(p1, p2);
}
@@ -461,7 +470,7 @@ bool wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &b
bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile)
{
wxHtmlPrintout *p = CreatePrintout();
p -> SetHtmlFile(htmlfile);
p->SetHtmlFile(htmlfile);
return DoPrint(p);
}
@@ -470,7 +479,7 @@ bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile)
bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath)
{
wxHtmlPrintout *p = CreatePrintout();
p -> SetHtmlText(htmltext, basepath, TRUE);
p->SetHtmlText(htmltext, basepath, TRUE);
return DoPrint(p);
}
@@ -481,7 +490,8 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
// Pass two printout objects: for preview, and possible printing.
wxPrintDialogData printDialogData(*m_PrintData);
wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
if (!preview -> Ok()) {
if (!preview->Ok())
{
delete preview;
return FALSE;
}
@@ -489,9 +499,9 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
wxPreviewFrame *frame = new wxPreviewFrame(preview, m_Frame,
m_Name + _(" Preview"),
wxPoint(100, 100), wxSize(650, 500));
frame -> Centre(wxBOTH);
frame -> Initialize();
frame -> Show(TRUE);
frame->Centre(wxBOTH);
frame->Initialize();
frame->Show(TRUE);
return TRUE;
}
@@ -528,10 +538,11 @@ void wxHtmlEasyPrinting::PrinterSetup()
void wxHtmlEasyPrinting::PageSetup()
{
m_PageSetupData -> SetPrintData(*m_PrintData);
m_PageSetupData->SetPrintData(*m_PrintData);
wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
if (pageSetupDialog.ShowModal() == wxID_OK) {
if (pageSetupDialog.ShowModal() == wxID_OK)
{
(*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData();
(*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
}
@@ -563,15 +574,15 @@ wxHtmlPrintout *wxHtmlEasyPrinting::CreatePrintout()
{
wxHtmlPrintout *p = new wxHtmlPrintout(m_Name);
p -> SetHeader(m_Headers[0], wxPAGE_EVEN);
p -> SetHeader(m_Headers[1], wxPAGE_ODD);
p -> SetFooter(m_Footers[0], wxPAGE_EVEN);
p -> SetFooter(m_Footers[1], wxPAGE_ODD);
p->SetHeader(m_Headers[0], wxPAGE_EVEN);
p->SetHeader(m_Headers[1], wxPAGE_ODD);
p->SetFooter(m_Footers[0], wxPAGE_EVEN);
p->SetFooter(m_Footers[1], wxPAGE_ODD);
p -> SetMargins(m_PageSetupData -> GetMarginTopLeft().y,
m_PageSetupData -> GetMarginBottomRight().y,
m_PageSetupData -> GetMarginTopLeft().x,
m_PageSetupData -> GetMarginBottomRight().x);
p->SetMargins(m_PageSetupData->GetMarginTopLeft().y,
m_PageSetupData->GetMarginBottomRight().y,
m_PageSetupData->GetMarginTopLeft().x,
m_PageSetupData->GetMarginBottomRight().x);
return p;
}