X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd9f7fea29e3f8bb61861f52984b7943512346ac..3798e298a412c4bc05b5aa83507b3c251dd36233:/wxPython/src/_printfw.i?ds=sidebyside

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 615cd9e629..55ddfca1b1 100644
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -19,13 +19,11 @@
 %{
 #include "wx/wxPython/printfw.h"
 
-    static const wxChar* wxPrintoutTitleStr = wxT("Printout");
-    DECLARE_DEF_STRING(PrintoutTitleStr);
-    static const wxChar* wxPreviewCanvasNameStr = wxT("previewcanvas");
-    DECLARE_DEF_STRING(PreviewCanvasNameStr);
-
 %}
 
+MAKE_CONST_WXSTRING2(PrintoutTitleStr, wxT("Printout"));
+MAKE_CONST_WXSTRING2(PreviewCanvasNameStr, wxT("previewcanvas"));
+
 
 //---------------------------------------------------------------------------
 
@@ -56,7 +54,7 @@ public:
     wxPaperSize GetPaperId();
     const wxSize& GetPaperSize();
 
-    wxPrintQuality GetQuality();
+    int GetQuality();
 
     void SetNoCopies(int v);
     void SetCollate(bool flag);
@@ -67,7 +65,7 @@ public:
     void SetDuplex(wxDuplexMode duplex);
     void SetPaperId(wxPaperSize sizeId);
     void SetPaperSize(const wxSize& sz);
-    void SetQuality(wxPrintQuality quality);
+    void SetQuality(int quality);
 
     // PostScript-specific data
     const wxString& GetPrinterCommand();
@@ -334,17 +332,25 @@ public:
     wxDC* GetDC();
     void SetDC(wxDC *dc);
 
-    void GetPageSizePixels(int *OUTPUT, int *OUTPUT);
     void SetPageSizePixels(int w, int  h);
+    DocDeclA(
+        void, GetPageSizePixels(int *OUTPUT, int *OUTPUT),
+        "GetPageSizePixels() -> (w, h)");
 
     void SetPageSizeMM(int w, int  h);
-    void GetPageSizeMM(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPageSizeMM(int *OUTPUT, int *OUTPUT),
+        "GetPageSizeMM() -> (w, h)");
     
     void SetPPIScreen(int x, int y);
-    void GetPPIScreen(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPPIScreen(int *OUTPUT, int *OUTPUT),
+        "GetPPIScreen() -> (x,y)");
     
     void SetPPIPrinter(int x, int y);
-    void GetPPIPrinter(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPPIPrinter(int *OUTPUT, int *OUTPUT),
+        "GetPPIPrinter() -> (x,y)");
 
     bool IsPreview();
     void SetIsPreview(bool p);
@@ -355,8 +361,10 @@ public:
     void base_OnBeginPrinting();
     void base_OnEndPrinting();
     void base_OnPreparePrinting();
-    void base_GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT);
     bool base_HasPage(int page);
+    DocDeclA(
+        void, base_GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT),
+        "base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)");
 };
 
 //---------------------------------------------------------------------------
@@ -366,7 +374,7 @@ public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:
-    %addtofunc wxPreviewCanvas   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewCanvas   "self._setOORInfo(self)"
 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,
@@ -379,7 +387,7 @@ public:
 
 class wxPreviewFrame : public wxFrame {
 public:
-    %addtofunc wxPreviewFrame   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewFrame   "self._setOORInfo(self)"
 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
@@ -419,7 +427,7 @@ enum {
 class wxPreviewControlBar: public wxPanel
 {
 public:
-    %addtofunc wxPreviewControlBar   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewControlBar   "self._setOORInfo(self)"
 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,