X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c0a71a250ae99e373db1eeb7ba2a3107f158239..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/richtext/richtextprint.h diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h index 3d43a590a2..29b86945e7 100644 --- a/include/wx/richtext/richtextprint.h +++ b/include/wx/richtext/richtextprint.h @@ -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); }; /* @@ -238,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