X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6a81734334cb6095d9da35ec077830f450377a54..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/richtext/richtextprint.h

diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 603551083a..1ff6ef1533 100644
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -107,7 +107,7 @@ private:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrintout : public wxPrintout
 {
 public:
-    wxRichTextPrintout(const wxString& title = wxT("Printout"));
+    wxRichTextPrintout(const wxString& title = _("Printout"));
     virtual ~wxRichTextPrintout();
 
     /// The buffer to print
@@ -119,7 +119,7 @@ public:
     const wxRichTextHeaderFooterData& GetHeaderFooterData() const { return m_headerFooterData; }
 
     /// Sets margins in 10ths of millimetre. Defaults to 1 inch for margins.
-    void SetMargins(int top = 252, int bottom = 252, int left = 252, int right = 252);
+    void SetMargins(int top = 254, int bottom = 254, int left = 254, int right = 254);
 
     /// Calculate scaling and rectangles, setting the device context scaling
     void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect);
@@ -145,11 +145,12 @@ private:
     int                         m_numPages;
     wxArrayInt                  m_pageBreaksStart;
     wxArrayInt                  m_pageBreaksEnd;
+    wxArrayInt                  m_pageYOffsets;
     int                         m_marginLeft, m_marginTop, m_marginRight, m_marginBottom;
 
     wxRichTextHeaderFooterData  m_headerFooterData;
 
-    DECLARE_NO_COPY_CLASS(wxRichTextPrintout)
+    wxDECLARE_NO_COPY_CLASS(wxRichTextPrintout);
 };
 
 /*
@@ -160,7 +161,7 @@ private:
 class WXDLLIMPEXP_RICHTEXT wxRichTextPrinting : public wxObject
 {
 public:
-    wxRichTextPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
+    wxRichTextPrinting(const wxString& name = _("Printing"), wxWindow *parentWindow = NULL);
     virtual ~wxRichTextPrinting();
 
     /// Preview the file or buffer
@@ -199,6 +200,10 @@ public:
     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() { return m_pageSetupData; }
 
+    /// Set print and page setup data
+    void SetPrintData(const wxPrintData& printData);
+    void SetPageSetupData(const wxPageSetupData& pageSetupData);
+
     /// Set the rich text buffer pointer, deleting the existing object if present
     void SetRichTextBufferPreview(wxRichTextBuffer* buf);
     wxRichTextBuffer* GetRichTextBufferPreview() const { return m_richTextBufferPreview; }
@@ -234,7 +239,7 @@ private:
     wxRichTextBuffer*           m_richTextBufferPrinting;
     wxRect                      m_previewRect;
 
-    DECLARE_NO_COPY_CLASS(wxRichTextPrinting)
+    wxDECLARE_NO_COPY_CLASS(wxRichTextPrinting);
 };
 
 #endif  // wxUSE_RICHTEXT & wxUSE_PRINTING_ARCHITECTURE