fixed typo

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 0cfff0be6bdf629230f8fb7bc800ba640053bfbf..d4df75d67ec93ebd94deb9127e42c092396b4ea7 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -70,7 +70,8 @@ public:
     bool GetCollate();
     int  GetOrientation();
 
-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
 
     const wxString& GetPrinterName();
     bool GetColour();
@@ -81,6 +82,7 @@ public:
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;
+    int GetMedia() const;
     
     void SetNoCopies(int v);
     void SetCollate(bool flag);
@@ -94,11 +96,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 +204,8 @@ public:
 
     wxPrintData& GetPrintData();
 
-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }
 
     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);
@@ -221,7 +225,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 +318,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`");
@@ -492,6 +497,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 +534,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 +717,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`");
@@ -866,6 +892,7 @@ MustHaveApp(wxPyPreviewFrame);
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
+    %disownarg(wxPrintPreview*);
     %pythonAppend wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,