no changes, just reformat, remove extraneous semicolons and inline keywords

[wxWidgets.git] / include / wx / richtext / richtextprint.h

diff --git a/include/wx/richtext/richtextprint.h b/include/wx/richtext/richtextprint.h
index 4a45c4e343ec0fc9f077a0b6083e25785de460e6..798aeebe573e4b45d9c8ab6f5cff0356227bd744 100644 (file)
--- a/include/wx/richtext/richtextprint.h
+++ b/include/wx/richtext/richtextprint.h
@@ -44,7 +44,7 @@ class WXDLLIMPEXP_RICHTEXT wxRichTextHeaderFooterData: public wxObject
 {
 public:
     wxRichTextHeaderFooterData() { Init(); }
 {
 public:
     wxRichTextHeaderFooterData() { Init(); }

-    wxRichTextHeaderFooterData(const wxRichTextHeaderFooterData& data) { Copy(data); }
+    wxRichTextHeaderFooterData(const wxRichTextHeaderFooterData& data): wxObject() { Copy(data); }

 
     /// Initialise
     void Init() { m_headerMargin = 20; m_footerMargin = 20; m_showOnFirstPage = true; }
 
     /// Initialise
     void Init() { m_headerMargin = 20; m_footerMargin = 20; m_showOnFirstPage = true; }


@@ -119,7 +119,7 @@ public:
     const wxRichTextHeaderFooterData& GetHeaderFooterData() const { return m_headerFooterData; }
 
     /// Sets margins in 10ths of millimetre. Defaults to 1 inch for margins.
     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);
 
     /// Calculate scaling and rectangles, setting the device context scaling
     void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect);


@@ -189,10 +189,20 @@ public:
     /// Show header/footer on first page, or not
     void SetShowOnFirstPage(bool show) { m_headerFooterData.SetShowOnFirstPage(show); }
 
     /// Show header/footer on first page, or not
     void SetShowOnFirstPage(bool show) { m_headerFooterData.SetShowOnFirstPage(show); }
 

+    /// Set the font
+    void SetHeaderFooterFont(const wxFont& font) { m_headerFooterData.SetFont(font); }
+
+    /// Set the colour
+    void SetHeaderFooterTextColour(const wxColour& font) { m_headerFooterData.SetTextColour(font); }
+

     /// Get print and page setup data
     wxPrintData *GetPrintData();
     wxPageSetupDialogData *GetPageSetupData() { return m_pageSetupData; }
 
     /// Get print and page setup data
     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; }
     /// Set the rich text buffer pointer, deleting the existing object if present
     void SetRichTextBufferPreview(wxRichTextBuffer* buf);
     wxRichTextBuffer* GetRichTextBufferPreview() const { return m_richTextBufferPreview; }