X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7012bb9f03e0012c32485655b7af4345b490bf4d..9e477492e29e03c02827b1e42a16cb09a13f5149:/wxPython/src/_printfw.i?ds=sidebyside

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 0cfff0be6b..a70f85a6c6 100644
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -69,8 +69,10 @@ public:
     int GetNoCopies();
     bool GetCollate();
     int  GetOrientation();
-
-    bool Ok();
+    bool IsOrientationReversed() const;
+    
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
 
     const wxString& GetPrinterName();
     bool GetColour();
@@ -81,11 +83,13 @@ public:
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;
+    int GetMedia() const;
     
     void SetNoCopies(int v);
     void SetCollate(bool flag);
     void SetOrientation(int orient);
-
+    void SetOrientationReversed(bool reversed);
+    
     void SetPrinterName(const wxString& name);
     void SetColour(bool colour);
     void SetDuplex(wxDuplexMode duplex);
@@ -94,11 +98,12 @@ public:
     void SetQuality(int quality);
     void SetBin(wxPrintBin bin);
     void SetPrintMode(wxPrintMode printMode);
- 
+    void SetMedia(int media);
+    
     wxString GetFilename() const;
     void SetFilename( const wxString &filename );
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
 
     //char* GetPrivData() const;
     //int GetPrivDataLen() const;
@@ -201,7 +206,8 @@ public:
 
     wxPrintData& GetPrintData();
 
-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
 
     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);
@@ -221,7 +227,7 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
 
     %property(DefaultInfo, GetDefaultInfo, SetDefaultInfo, doc="See `GetDefaultInfo` and `SetDefaultInfo`");
     %property(DefaultMinMargins, GetDefaultMinMargins, SetDefaultMinMargins, doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`");
@@ -314,13 +320,14 @@ public:
     bool GetEnableHelp() const;
 
     // Is this data OK for showing the print dialog?
-    bool Ok() const;
+    bool IsOk() const;
+    %pythoncode { Ok = IsOk }
 
     
     wxPrintData& GetPrintData();
     void SetPrintData(const wxPrintData& printData);
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
     
     %property(AllPages, GetAllPages, SetAllPages, doc="See `GetAllPages` and `SetAllPages`");
     %property(Collate, GetCollate, SetCollate, doc="See `GetCollate` and `SetCollate`");
@@ -476,7 +483,7 @@ MustHaveApp(wxPyPrintout);
 %rename(Printout) wxPyPrintout;
 class wxPyPrintout  : public wxObject {
 public:
-    %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"
+    %pythonAppend wxPyPrintout   setCallbackInfo(Printout)
     %typemap(out) wxPyPrintout*;    // turn off this typemap
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
@@ -492,6 +499,23 @@ public:
     wxDC* GetDC();
     void SetDC(wxDC *dc);
 
+    
+    void FitThisSizeToPaper(const wxSize& imageSize);
+    void FitThisSizeToPage(const wxSize& imageSize);
+    void FitThisSizeToPageMargins(const wxSize& imageSize, const wxPageSetupDialogData& pageSetupData);
+    void MapScreenSizeToPaper();
+    void MapScreenSizeToPage();
+    void MapScreenSizeToPageMargins(const wxPageSetupDialogData& pageSetupData);
+    void MapScreenSizeToDevice();
+
+    wxRect GetLogicalPaperRect() const;
+    wxRect GetLogicalPageRect() const;
+    wxRect GetLogicalPageMarginsRect(const wxPageSetupDialogData& pageSetupData) const;
+
+    void SetLogicalOrigin(wxCoord x, wxCoord y);
+    void OffsetLogicalOrigin(wxCoord xoff, wxCoord yoff);
+
+    
     void SetPageSizePixels(int w, int  h);
     DocDeclA(
         void, GetPageSizePixels(int *OUTPUT, int *OUTPUT),
@@ -512,6 +536,9 @@ public:
         void, GetPPIPrinter(int *OUTPUT, int *OUTPUT),
         "GetPPIPrinter() -> (x,y)");
 
+    void SetPaperRectPixels(const wxRect& paperRectPixels);
+    wxRect GetPaperRectPixels() const;
+
     bool IsPreview();
     void SetIsPreview(bool p);
 
@@ -692,13 +719,14 @@ public:
     int GetMaxPage();
     int GetMinPage();
 
-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
     void SetOk(bool ok);
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
-    %pythoncode { def __nonzero__(self): return self.Ok() }
+    %pythoncode { def __nonzero__(self): return self.IsOk() }
     
     %property(Canvas, GetCanvas, SetCanvas, doc="See `GetCanvas` and `SetCanvas`");
     %property(CurrentPage, GetCurrentPage, SetCurrentPage, doc="See `GetCurrentPage` and `SetCurrentPage`");
@@ -796,7 +824,7 @@ class wxPyPrintPreview : public wxPrintPreview
 public:
     %disownarg(wxPyPrintout*);
 
-    %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
+    %pythonAppend wxPyPrintPreview   setCallbackInfo(PyPrintPreview)
     %nokwargs wxPyPrintPreview;
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
@@ -866,7 +894,8 @@ MustHaveApp(wxPyPreviewFrame);
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
-    %pythonAppend wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
+    %disownarg(wxPrintPreview*);
+    %pythonAppend wxPyPreviewFrame "self._setOORInfo(self);" setCallbackInfo(PyPreviewFrame) 
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,
@@ -926,7 +955,7 @@ MustHaveApp(wxPyPreviewControlBar);
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:
-    %pythonAppend wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewControlBar   "self._setOORInfo(self);" setCallbackInfo(PyPreviewControlBar)
 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,