Added a parameter to PrintBuffer and PrintFile to allow silent or prompted printing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index cba26f9091bda652a85cd9d8de5b21531a074de0..8ca2e80bb3017fd9c5a34784e0b2b41e35d00615 100644 (file)
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -169,8 +169,8 @@ public:
     bool PreviewBuffer(const wxRichTextBuffer& buffer);
 
     /// Print the file or buffer
     bool PreviewBuffer(const wxRichTextBuffer& buffer);
 
     /// Print the file or buffer

-    bool PrintFile(const wxString& richTextFile);
-    bool PrintBuffer(const wxRichTextBuffer& buffer);
+    bool PrintFile(const wxString& richTextFile, bool showPrintDialog = true);
+    bool PrintBuffer(const wxRichTextBuffer& buffer, bool showPrintDialog = true);

 
     /// Shows page setup dialog
     void PageSetup();
 
     /// Shows page setup dialog
     void PageSetup();


@@ -226,7 +226,7 @@ public:
 protected:
     virtual wxRichTextPrintout *CreatePrintout();
     virtual bool DoPreview(wxRichTextPrintout *printout1, wxRichTextPrintout *printout2);
 protected:
     virtual wxRichTextPrintout *CreatePrintout();
     virtual bool DoPreview(wxRichTextPrintout *printout1, wxRichTextPrintout *printout2);

-    virtual bool DoPrint(wxRichTextPrintout *printout);
+    virtual bool DoPrint(wxRichTextPrintout *printout, bool showPrintDialog);

 
 private:
     wxPrintData*                m_printData;
 
 private:
     wxPrintData*                m_printData;

diff --git a/interface/wx/richtext/richtextprint.h b/interface/wx/richtext/richtextprint.h
index 9a6c185c8ce8bb7ab26dd1ca2f0f1b8fad8cdb5d..5a756e5028d75bdf13823a51708e4de39c26c842 100644 (file)
--- a/interface/wx/richtext/richtextprint.h
+++ b/interface/wx/richtext/richtextprint.h
@@ -341,14 +341,16 @@ public:
 
     /**
         Prints the given buffer. The function takes its own copy of @a buffer.
 
     /**
         Prints the given buffer. The function takes its own copy of @a buffer.

+        @showPrintDialog can be @true to show the print dialog, or @false to print quietly.

     */
     */

-    bool PrintBuffer(const wxRichTextBuffer& buffer);
+    bool PrintBuffer(const wxRichTextBuffer& buffer, bool showPrintDialog = true);

 
     /**
         Prints the given file. @a richTextFile can be a text file or XML file,
 
     /**
         Prints the given file. @a richTextFile can be a text file or XML file,

-        or other file depending on the available file handlers.
+        or other file depending on the available file handlers. @showPrintDialog
+        can be @true to show the print dialog, or @false to print quietly.

     */
     */

-    bool PrintFile(const wxString& richTextFile);
+    bool PrintFile(const wxString& richTextFile, bool showPrintDialog = true);

 
     /**
         A convenience function to set the footer text.
 
     /**
         A convenience function to set the footer text.

diff --git a/src/richtext/richtextprint.cpp b/src/richtext/richtextprint.cpp
index b491ac947b33b9a94581d0e4314f6ea3cb4fe36a..cc4714cdd3fdd458986c4d323870f39d25f6a709 100644 (file)
--- a/src/richtext/richtextprint.cpp
+++ b/src/richtext/richtextprint.cpp
@@ -537,7 +537,7 @@ bool wxRichTextPrinting::PreviewBuffer(const wxRichTextBuffer& buffer)
     return DoPreview(p1, p2);
 }
 
     return DoPreview(p1, p2);
 }
 

-bool wxRichTextPrinting::PrintFile(const wxString& richTextFile)
+bool wxRichTextPrinting::PrintFile(const wxString& richTextFile, bool showPrintDialog)

 {
     SetRichTextBufferPrinting(new wxRichTextBuffer);
 
 {
     SetRichTextBufferPrinting(new wxRichTextBuffer);
 


@@ -550,19 +550,19 @@ bool wxRichTextPrinting::PrintFile(const wxString& richTextFile)
     wxRichTextPrintout *p = CreatePrintout();
     p->SetRichTextBuffer(m_richTextBufferPrinting);
 
     wxRichTextPrintout *p = CreatePrintout();
     p->SetRichTextBuffer(m_richTextBufferPrinting);
 

-    bool ret = DoPrint(p);
+    bool ret = DoPrint(p, showPrintDialog);

     delete p;
     return ret;
 }
 
     delete p;
     return ret;
 }
 

-bool wxRichTextPrinting::PrintBuffer(const wxRichTextBuffer& buffer)
+bool wxRichTextPrinting::PrintBuffer(const wxRichTextBuffer& buffer, bool showPrintDialog)

 {
     SetRichTextBufferPrinting(new wxRichTextBuffer(buffer));
 
     wxRichTextPrintout *p = CreatePrintout();
     p->SetRichTextBuffer(m_richTextBufferPrinting);
 
 {
     SetRichTextBufferPrinting(new wxRichTextBuffer(buffer));
 
     wxRichTextPrintout *p = CreatePrintout();
     p->SetRichTextBuffer(m_richTextBufferPrinting);
 

-    bool ret = DoPrint(p);
+    bool ret = DoPrint(p, showPrintDialog);

     delete p;
     return ret;
 }
     delete p;
     return ret;
 }


@@ -587,12 +587,12 @@ bool wxRichTextPrinting::DoPreview(wxRichTextPrintout *printout1, wxRichTextPrin
     return true;
 }
 
     return true;
 }
 

-bool wxRichTextPrinting::DoPrint(wxRichTextPrintout *printout)
+bool wxRichTextPrinting::DoPrint(wxRichTextPrintout *printout, bool showPrintDialog)

 {
     wxPrintDialogData printDialogData(*GetPrintData());
     wxPrinter printer(&printDialogData);
 
 {
     wxPrintDialogData printDialogData(*GetPrintData());
     wxPrinter printer(&printDialogData);
 

-    if (!printer.Print(m_parentWindow, printout, true))
+    if (!printer.Print(m_parentWindow, printout, showPrintDialog))

     {
         return false;
     }
     {
         return false;
     }