Forward-port of r62758 (Added wxHtmlEasyPrinting name accessor and modifier).

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

diff --git a/include/wx/html/htmprint.h b/include/wx/html/htmprint.h
index cf0a18fb122ad929585ee8d0e935ca3dd1945bf3..b5da2bad870d93a28bca326b204b1c65c000dc3b 100644 (file)
--- a/include/wx/html/htmprint.h
+++ b/include/wx/html/htmprint.h
@@ -276,6 +276,11 @@ public:
     void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
             // set the parent window
 
     void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
             // set the parent window
 

+    const wxString& GetName() const { return m_Name; }
+            // get the printout name
+    void SetName(const wxString& name) { m_Name = name; }
+            // set the printout name
+

 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
 protected:
     virtual wxHtmlPrintout *CreatePrintout();
     virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);

diff --git a/interface/wx/html/htmprint.h b/interface/wx/html/htmprint.h
index ea13f16f99b20b0179b0e57f7a894ed6204d888d..83643716ea6502605fc856f35e03bf262d652c52 100644 (file)
--- a/interface/wx/html/htmprint.h
+++ b/interface/wx/html/htmprint.h
@@ -190,6 +190,14 @@ public:
     wxHtmlEasyPrinting(const wxString& name = "Printing",
                        wxWindow* parentWindow = NULL);
 
     wxHtmlEasyPrinting(const wxString& name = "Printing",
                        wxWindow* parentWindow = NULL);
 

+    /**
+        Returns the current name being used for preview frames and setup
+        dialogs.
+
+        @since 2.8.11 / 2.9.1
+    */
+    const wxString& GetName() const;
+

     /**
         Returns a pointer to wxPageSetupDialogData instance used by this class.
         You can set its parameters (via SetXXXX methods).
     /**
         Returns a pointer to wxPageSetupDialogData instance used by this class.
         You can set its parameters (via SetXXXX methods).


@@ -264,6 +272,13 @@ public:
     void SetFonts(const wxString& normal_face, const wxString& fixed_face,
                   const int* sizes = NULL);
   
     void SetFonts(const wxString& normal_face, const wxString& fixed_face,
                   const int* sizes = NULL);
   

+    /**
+        Sets the name used for preview frames and setup dialogs.
+
+        @since 2.8.11 / 2.9.1
+    */
+    void SetName(const wxString& name);
+

     /**
         Sets default font sizes and/or default font size. 
         See wxHtmlDCRenderer::SetStandardFonts for detailed description.
     /**
         Sets default font sizes and/or default font size. 
         See wxHtmlDCRenderer::SetStandardFonts for detailed description.