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

create wxPrintData instance on demand

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-23 22:38:30 +00:00
parent 9513c5b609
commit 632783de61
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@ public:
void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0); void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes = 0);
// Sets fonts to be used when displaying HTML page. (if size null then default sizes used) // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
wxPrintData *GetPrintData() {return m_PrintData;} wxPrintData *GetPrintData();
wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;} wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
// return page setting data objects. // return page setting data objects.
// (You can set their parameters.) // (You can set their parameters.)

25
src/html/htmprint.cpp
View File

@@ -457,7 +457,7 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxWindow *parentWin
{ {
m_ParentWindow = parentWindow; m_ParentWindow = parentWindow;
m_Name = name; m_Name = name;
m_PrintData = new wxPrintData; m_PrintData = NULL;
m_PageSetupData = new wxPageSetupDialogData; m_PageSetupData = new wxPageSetupDialogData;
m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString; m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
@@ -477,6 +477,13 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
} }
wxPrintData *wxHtmlEasyPrinting::GetPrintData()
{
if (m_PrintData == NULL)
m_PrintData = new wxPrintData();
return m_PrintData;
}
bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
{ {
@@ -525,7 +532,7 @@ bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &bas
bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2) bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2)
{ {
// Pass two printout objects: for preview, and possible printing. // Pass two printout objects: for preview, and possible printing.
wxPrintDialogData printDialogData(*m_PrintData); wxPrintDialogData printDialogData(*GetPrintData());
wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
if (!preview->Ok()) if (!preview->Ok())
{ {
@@ -546,7 +553,7 @@ bool wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
{ {
wxPrintDialogData printDialogData(*m_PrintData); wxPrintDialogData printDialogData(*GetPrintData());
wxPrinter printer(&printDialogData); wxPrinter printer(&printDialogData);
if (!printer.Print(m_ParentWindow, printout, TRUE)) if (!printer.Print(m_ParentWindow, printout, TRUE))
@@ -554,7 +561,7 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
return FALSE; return FALSE;
} }
(*m_PrintData) = printer.GetPrintDialogData().GetPrintData(); (*GetPrintData()) = printer.GetPrintDialogData().GetPrintData();
return TRUE; return TRUE;
} }
@@ -562,31 +569,31 @@ bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
void wxHtmlEasyPrinting::PrinterSetup() void wxHtmlEasyPrinting::PrinterSetup()
{ {
wxPrintDialogData printDialogData(*m_PrintData); wxPrintDialogData printDialogData(*GetPrintData());
wxPrintDialog printerDialog(m_ParentWindow, &printDialogData); wxPrintDialog printerDialog(m_ParentWindow, &printDialogData);
printerDialog.GetPrintDialogData().SetSetupDialog(TRUE); printerDialog.GetPrintDialogData().SetSetupDialog(TRUE);
if (printerDialog.ShowModal() == wxID_OK) if (printerDialog.ShowModal() == wxID_OK)
(*m_PrintData) = printerDialog.GetPrintDialogData().GetPrintData(); (*GetPrintData()) = printerDialog.GetPrintDialogData().GetPrintData();
} }
void wxHtmlEasyPrinting::PageSetup() void wxHtmlEasyPrinting::PageSetup()
{ {
if (!m_PrintData->Ok()) if (!GetPrintData()->Ok())
{ {
wxLogError(_("There was a problem during page setup: you may need to set a default printer.")); wxLogError(_("There was a problem during page setup: you may need to set a default printer."));
return; return;
} }
m_PageSetupData->SetPrintData(*m_PrintData); m_PageSetupData->SetPrintData(*GetPrintData());
wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData); wxPageSetupDialog pageSetupDialog(m_ParentWindow, m_PageSetupData);
if (pageSetupDialog.ShowModal() == wxID_OK) if (pageSetupDialog.ShowModal() == wxID_OK)
{ {
(*m_PrintData) = pageSetupDialog.GetPageSetupData().GetPrintData(); (*GetPrintData()) = pageSetupDialog.GetPageSetupData().GetPrintData();
(*m_PageSetupData) = pageSetupDialog.GetPageSetupData(); (*m_PageSetupData) = pageSetupDialog.GetPageSetupData();
} }
} }