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

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/html/htmprint.cpp
View File

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