Store property name and value in wxPropertyGridEvent, keep track of live event instan...

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

diff --git a/interface/wx/richtext/richtextprint.h b/interface/wx/richtext/richtextprint.h
index d3a0208ff768a068de5e04f9c9d1224336fd356d..6344debdd4d875c5a298e063c901a27a7196617a 100644 (file)
--- a/interface/wx/richtext/richtextprint.h
+++ b/interface/wx/richtext/richtextprint.h
@@ -120,7 +120,7 @@ public:
     /**
         Returns the text colour for drawing the header and footer.
     */
-    const wxColour GetTextColour() const;
+    const wxColour& GetTextColour() const;
 
     /**
         Initialises the object.
@@ -194,7 +194,7 @@ public:
     /**
         Constructor.
     */
-    wxRichTextPrintout(const wxString& title = wxT("Printout"));
+    wxRichTextPrintout(const wxString& title = "Printout");
 
     /**
         Calculates scaling and text, header and footer rectangles.
@@ -206,13 +206,13 @@ public:
     /**
         Returns the header and footer data associated with the printout.
     */
-    const wxRichTextHeaderFooterData GetHeaderFooterData() const;
+    const wxRichTextHeaderFooterData& GetHeaderFooterData() const;
 
     /**
         Gets the page information.
     */
-    void GetPageInfo(int* minPage, int* maxPage, int* selPageFrom,
-                     int* selPageTo);
+    virtual void GetPageInfo(int* minPage, int* maxPage, int* selPageFrom,
+                             int* selPageTo);
 
     /**
         Returns a pointer to the buffer being rendered.
@@ -242,8 +242,8 @@ public:
     /**
         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);
 
     /**
         Sets the buffer to print. wxRichTextPrintout does not manage this pointer;
@@ -272,7 +272,7 @@ public:
         Optionally pass a title to be used in the preview frame and printing wait
         dialog, and also a parent window for these windows.
     */
-    wxRichTextPrinting(const wxString& name = wxT("Printing"),
+    wxRichTextPrinting(const wxString& name = "Printing",
                        wxWindow* parentWindow = NULL);
 
     /**
@@ -285,7 +285,7 @@ public:
     /**
         Returns the internal wxRichTextHeaderFooterData object.
     */
-    const wxRichTextHeaderFooterData GetHeaderFooterData() const;
+    const wxRichTextHeaderFooterData& GetHeaderFooterData() const;
 
     /**
         A convenience function to get the header text.
@@ -308,7 +308,7 @@ public:
     /**
         Returns the dimensions to be used for the preview window.
     */
-    const wxRect GetPreviewRect() const;
+    const wxRect& GetPreviewRect() const;
 
     /**
         Returns a pointer to the internal print data.
@@ -318,7 +318,7 @@ public:
     /**
         Returns the title of the preview window or printing wait caption.
     */
-    const wxString GetTitle() const;
+    const wxString& GetTitle() const;
 
     /**
         Shows the page setup dialog.
@@ -384,7 +384,7 @@ public:
     /**
         Sets the page setup data.
     */
-    void SetPageSetupData(const wxPageSetupData& pageSetupData);
+    void SetPageSetupData(const wxPageSetupDialogData& pageSetupData);
 
     /**
         Sets the parent window to be used for the preview window and printing