bitwise vs. logical operator

[wxWidgets.git] / wxPython / src / _printfw.i

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 570bb5355c20e8bfd0c774f21979ec30abaebb2f..a70f85a6c64d3f5d469b31aea29f924f2aa8135e 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -69,7 +69,8 @@ public:
     int GetNoCopies();
     bool GetCollate();
     int  GetOrientation();
-
+    bool IsOrientationReversed() const;
+    
     bool IsOk();
     %pythoncode { Ok = IsOk }
 
@@ -82,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);
@@ -95,7 +98,8 @@ 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 );
 
@@ -479,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);
@@ -495,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),
@@ -515,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);
 
@@ -800,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,
@@ -870,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,
@@ -930,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,