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

changed return value of some wxHtmlEasyPrinting methods from void to bool (related to wxPrinter change)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-07-03 20:23:29 +00:00
parent 8a7ec928f5
commit d506e640af
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,14 +179,14 @@ class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
wxHtmlEasyPrinting(const wxString& name = "Printing", wxFrame *parent_frame = NULL); wxHtmlEasyPrinting(const wxString& name = "Printing", wxFrame *parent_frame = NULL);
~wxHtmlEasyPrinting(); ~wxHtmlEasyPrinting();
void PreviewFile(const wxString &htmlfile); bool PreviewFile(const wxString &htmlfile);
void PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString); bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
// Preview file / html-text for printing // Preview file / html-text for printing
// (and offers printing) // (and offers printing)
// basepath is base directory for opening subsequent files (e.g. from <img> tag) // basepath is base directory for opening subsequent files (e.g. from <img> tag)
void PrintFile(const wxString &htmlfile); bool PrintFile(const wxString &htmlfile);
void PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString); bool PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
// Print file / html-text w/o preview // Print file / html-text w/o preview
void PrinterSetup(); void PrinterSetup();
@@ -211,8 +211,8 @@ class WXDLLEXPORT wxHtmlEasyPrinting : public wxObject
private: private:
wxHtmlPrintout *CreatePrintout(); wxHtmlPrintout *CreatePrintout();
void DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2); bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
void DoPrint(wxHtmlPrintout *printout); bool DoPrint(wxHtmlPrintout *printout);
wxPrintData *m_PrintData; wxPrintData *m_PrintData;
wxPageSetupDialogData *m_PageSetupData; wxPageSetupDialogData *m_PageSetupData;

30
src/html/htmprint.cpp
View File

@@ -436,54 +436,54 @@ wxHtmlEasyPrinting::~wxHtmlEasyPrinting()
void wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile) bool wxHtmlEasyPrinting::PreviewFile(const wxString &htmlfile)
{ {
wxHtmlPrintout *p1 = CreatePrintout(); wxHtmlPrintout *p1 = CreatePrintout();
p1 -> SetHtmlFile(htmlfile); p1 -> SetHtmlFile(htmlfile);
wxHtmlPrintout *p2 = CreatePrintout(); wxHtmlPrintout *p2 = CreatePrintout();
p2 -> SetHtmlFile(htmlfile); p2 -> SetHtmlFile(htmlfile);
DoPreview(p1, p2); return DoPreview(p1, p2);
} }
void wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath) bool wxHtmlEasyPrinting::PreviewText(const wxString &htmltext, const wxString &basepath)
{ {
wxHtmlPrintout *p1 = CreatePrintout(); wxHtmlPrintout *p1 = CreatePrintout();
p1 -> SetHtmlText(htmltext, basepath, TRUE); p1 -> SetHtmlText(htmltext, basepath, TRUE);
wxHtmlPrintout *p2 = CreatePrintout(); wxHtmlPrintout *p2 = CreatePrintout();
p2 -> SetHtmlText(htmltext, basepath, TRUE); p2 -> SetHtmlText(htmltext, basepath, TRUE);
DoPreview(p1, p2); return DoPreview(p1, p2);
} }
void wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile) bool wxHtmlEasyPrinting::PrintFile(const wxString &htmlfile)
{ {
wxHtmlPrintout *p = CreatePrintout(); wxHtmlPrintout *p = CreatePrintout();
p -> SetHtmlFile(htmlfile); p -> SetHtmlFile(htmlfile);
DoPrint(p); return DoPrint(p);
} }
void wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath) bool wxHtmlEasyPrinting::PrintText(const wxString &htmltext, const wxString &basepath)
{ {
wxHtmlPrintout *p = CreatePrintout(); wxHtmlPrintout *p = CreatePrintout();
p -> SetHtmlText(htmltext, basepath, TRUE); p -> SetHtmlText(htmltext, basepath, TRUE);
DoPrint(p); return DoPrint(p);
} }
void 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(*m_PrintData);
wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData); wxPrintPreview *preview = new wxPrintPreview(printout1, printout2, &printDialogData);
if (!preview -> Ok()) { if (!preview -> Ok()) {
delete preview; delete preview;
wxMessageBox(_("There was a problem previewing.\nPerhaps your current printer is not set correctly?"), _("Previewing"), wxOK); return FALSE;
} }
else { else {
@@ -493,20 +493,26 @@ void wxHtmlEasyPrinting::DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *pr
frame -> Centre(wxBOTH); frame -> Centre(wxBOTH);
frame -> Initialize(); frame -> Initialize();
frame -> Show(TRUE); frame -> Show(TRUE);
return TRUE;
} }
} }
void wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout) bool wxHtmlEasyPrinting::DoPrint(wxHtmlPrintout *printout)
{ {
wxPrintDialogData printDialogData(*m_PrintData); wxPrintDialogData printDialogData(*m_PrintData);
wxPrinter printer(&printDialogData); wxPrinter printer(&printDialogData);
if (!printer.Print(m_Frame, printout, TRUE)) if (!printer.Print(m_Frame, printout, TRUE))
wxMessageBox(_("There was a problem printing.\nPerhaps your current printer is not set correctly?"), _("Printing"), wxOK); {
return FALSE;
}
else else
{
(*m_PrintData) = printer.GetPrintDialogData().GetPrintData(); (*m_PrintData) = printer.GetPrintDialogData().GetPrintData();
return TRUE;
}
} }