bitwise vs. logical operator

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 43c734854a1a55ca578988a9bd530bdfeb92f235..a70f85a6c64d3f5d469b31aea29f924f2aa8135e 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -69,8 +69,10 @@ public:
     int GetNoCopies();
     bool GetCollate();
     int  GetOrientation();
     int GetNoCopies();
     bool GetCollate();
     int  GetOrientation();

-
-    bool Ok();
+    bool IsOrientationReversed() const;
+    
+    bool IsOk();
+    %pythoncode { Ok = IsOk }

 
     const wxString& GetPrinterName();
     bool GetColour();
 
     const wxString& GetPrinterName();
     bool GetColour();


@@ -81,11 +83,13 @@ public:
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;
     int GetQuality();
     wxPrintBin GetBin();
     wxPrintMode GetPrintMode() const;

+    int GetMedia() const;

     
     void SetNoCopies(int v);
     void SetCollate(bool flag);
     void SetOrientation(int orient);
     
     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);
     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 SetQuality(int quality);
     void SetBin(wxPrintBin bin);
     void SetPrintMode(wxPrintMode printMode);

- 
+    void SetMedia(int media);
+    

     wxString GetFilename() const;
     void SetFilename( const wxString &filename );
 
     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;
 
     //char* GetPrivData() const;
     //int GetPrivDataLen() const;


@@ -154,6 +159,19 @@ public:
     void SetPrinterTranslation(long x, long y);
 #endif
 
     void SetPrinterTranslation(long x, long y);
 #endif
 

+    %property(Bin, GetBin, SetBin, doc="See `GetBin` and `SetBin`");
+    %property(Collate, GetCollate, SetCollate, doc="See `GetCollate` and `SetCollate`");
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");
+    %property(Duplex, GetDuplex, SetDuplex, doc="See `GetDuplex` and `SetDuplex`");
+    %property(Filename, GetFilename, SetFilename, doc="See `GetFilename` and `SetFilename`");
+    %property(NoCopies, GetNoCopies, SetNoCopies, doc="See `GetNoCopies` and `SetNoCopies`");
+    %property(Orientation, GetOrientation, SetOrientation, doc="See `GetOrientation` and `SetOrientation`");
+    %property(PaperId, GetPaperId, SetPaperId, doc="See `GetPaperId` and `SetPaperId`");
+    %property(PaperSize, GetPaperSize, SetPaperSize, doc="See `GetPaperSize` and `SetPaperSize`");
+    %property(PrintMode, GetPrintMode, SetPrintMode, doc="See `GetPrintMode` and `SetPrintMode`");
+    %property(PrinterName, GetPrinterName, SetPrinterName, doc="See `GetPrinterName` and `SetPrinterName`");
+    %property(PrivData, GetPrivData, SetPrivData, doc="See `GetPrivData` and `SetPrivData`");
+    %property(Quality, GetQuality, SetQuality, doc="See `GetQuality` and `SetQuality`");   

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -188,7 +206,8 @@ public:
 
     wxPrintData& GetPrintData();
 
 
     wxPrintData& GetPrintData();
 

-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }

 
     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);
 
     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);


@@ -208,7 +227,25 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
     // 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`");
+
+//     %property(EnableHelp, GetEnableHelp, doc="See `GetEnableHelp`");
+//     %property(EnableMargins, GetEnableMargins, doc="See `GetEnableMargins`");
+//     %property(EnableOrientation, GetEnableOrientation, doc="See `GetEnableOrientation`");
+//     %property(EnablePaper, GetEnablePaper, doc="See `GetEnablePaper`");
+//     %property(EnablePrinter, GetEnablePrinter, doc="See `GetEnablePrinter`");
+
+    %property(MarginBottomRight, GetMarginBottomRight, SetMarginBottomRight, doc="See `GetMarginBottomRight` and `SetMarginBottomRight`");
+    %property(MarginTopLeft, GetMarginTopLeft, SetMarginTopLeft, doc="See `GetMarginTopLeft` and `SetMarginTopLeft`");
+    %property(MinMarginBottomRight, GetMinMarginBottomRight, SetMinMarginBottomRight, doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`");
+    %property(MinMarginTopLeft, GetMinMarginTopLeft, SetMinMarginTopLeft, doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`");
+    %property(PaperId, GetPaperId, SetPaperId, doc="See `GetPaperId` and `SetPaperId`");
+    %property(PaperSize, GetPaperSize, SetPaperSize, doc="See `GetPaperSize` and `SetPaperSize`");
+    %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`");
+    

 };
 
 
 };
 
 


@@ -230,6 +267,10 @@ public:
     int ShowModal();
 
     %pythoncode { def Destroy(self): pass }
     int ShowModal();
 
     %pythoncode { def Destroy(self): pass }

+
+    %property(PageSetupData, GetPageSetupData, doc="See `GetPageSetupData`");
+    %property(PageSetupDialogData, GetPageSetupDialogData, doc="See `GetPageSetupDialogData`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -279,13 +320,29 @@ public:
     bool GetEnableHelp() const;
 
     // Is this data OK for showing the print dialog?
     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);
 
 
     
     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`");
+//     %property(EnableHelp, GetEnableHelp, doc="See `GetEnableHelp`");
+//     %property(EnablePageNumbers, GetEnablePageNumbers, doc="See `GetEnablePageNumbers`");
+//     %property(EnablePrintToFile, GetEnablePrintToFile, doc="See `GetEnablePrintToFile`");
+//     %property(EnableSelection, GetEnableSelection, doc="See `GetEnableSelection`");
+    %property(FromPage, GetFromPage, SetFromPage, doc="See `GetFromPage` and `SetFromPage`");
+    %property(MaxPage, GetMaxPage, SetMaxPage, doc="See `GetMaxPage` and `SetMaxPage`");
+    %property(MinPage, GetMinPage, SetMinPage, doc="See `GetMinPage` and `SetMinPage`");
+    %property(NoCopies, GetNoCopies, SetNoCopies, doc="See `GetNoCopies` and `SetNoCopies`");
+    %property(PrintData, GetPrintData, SetPrintData, doc="See `GetPrintData` and `SetPrintData`");
+    %property(PrintToFile, GetPrintToFile, SetPrintToFile, doc="See `GetPrintToFile` and `SetPrintToFile`");
+    %property(Selection, GetSelection, SetSelection, doc="See `GetSelection` and `SetSelection`");
+    %property(ToPage, GetToPage, SetToPage, doc="See `GetToPage` and `SetToPage`");

 };
 
 
 };
 
 


@@ -314,6 +371,10 @@ public:
     virtual wxDC *GetPrintDC();
 
     %pythoncode { def Destroy(self): pass }
     virtual wxDC *GetPrintDC();
 
     %pythoncode { def Destroy(self): pass }

+    
+    %property(PrintDC, GetPrintDC, doc="See `GetPrintDC`");
+    %property(PrintData, GetPrintData, doc="See `GetPrintData`");
+    %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`");

 };
 
 
 };
 
 


@@ -348,6 +409,8 @@ public:
     bool GetAbort();
     static wxPrinterError GetLastError();
 
     bool GetAbort();
     static wxPrinterError GetLastError();
 

+    %property(Abort, GetAbort, doc="See `GetAbort`");
+    %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`");

 };
 
 
 };
 
 


@@ -420,7 +483,7 @@ MustHaveApp(wxPyPrintout);
 %rename(Printout) wxPyPrintout;
 class wxPyPrintout  : public wxObject {
 public:
 %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);
     %typemap(out) wxPyPrintout*;    // turn off this typemap
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);


@@ -436,6 +499,23 @@ public:
     wxDC* GetDC();
     void SetDC(wxDC *dc);
 
     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),
     void SetPageSizePixels(int w, int  h);
     DocDeclA(
         void, GetPageSizePixels(int *OUTPUT, int *OUTPUT),


@@ -456,6 +536,9 @@ public:
         void, GetPPIPrinter(int *OUTPUT, int *OUTPUT),
         "GetPPIPrinter() -> (x,y)");
 
         void, GetPPIPrinter(int *OUTPUT, int *OUTPUT),
         "GetPPIPrinter() -> (x,y)");
 

+    void SetPaperRectPixels(const wxRect& paperRectPixels);
+    wxRect GetPaperRectPixels() const;
+

     bool IsPreview();
     void SetIsPreview(bool p);
 
     bool IsPreview();
     void SetIsPreview(bool p);
 


@@ -476,6 +559,14 @@ public:
     %MAKE_BASE_FUNC(Printout, OnEndPrinting);
     %MAKE_BASE_FUNC(Printout, OnPreparePrinting);
     %MAKE_BASE_FUNC(Printout, GetPageInfo);
     %MAKE_BASE_FUNC(Printout, OnEndPrinting);
     %MAKE_BASE_FUNC(Printout, OnPreparePrinting);
     %MAKE_BASE_FUNC(Printout, GetPageInfo);

+
+    
+    %property(DC, GetDC, SetDC, doc="See `GetDC` and `SetDC`");
+    %property(PPIPrinter, GetPPIPrinter, SetPPIPrinter, doc="See `GetPPIPrinter` and `SetPPIPrinter`");
+    %property(PPIScreen, GetPPIScreen, SetPPIScreen, doc="See `GetPPIScreen` and `SetPPIScreen`");
+    %property(PageSizeMM, GetPageSizeMM, SetPageSizeMM, doc="See `GetPageSizeMM` and `SetPageSizeMM`");
+    %property(PageSizePixels, GetPageSizePixels, SetPageSizePixels, doc="See `GetPageSizePixels` and `SetPageSizePixels`");
+    %property(Title, GetTitle, doc="See `GetTitle`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -518,6 +609,8 @@ public:
     void CreateCanvas();
 
     wxPreviewControlBar* GetControlBar() const;
     void CreateCanvas();
 
     wxPreviewControlBar* GetControlBar() const;

+
+    %property(ControlBar, GetControlBar, doc="See `GetControlBar`");

 };
 
 
 };
 
 


@@ -566,6 +659,9 @@ public:
     void OnFirst();
     void OnLast();
     void OnGoto();
     void OnFirst();
     void OnLast();
     void OnGoto();

+
+    %property(PrintPreview, GetPrintPreview, doc="See `GetPrintPreview`");
+    %property(ZoomControl, GetZoomControl, SetZoomControl, doc="See `GetZoomControl` and `SetZoomControl`");    

 };
 
 
 };
 
 


@@ -623,13 +719,24 @@ public:
     int GetMaxPage();
     int GetMinPage();
 
     int GetMaxPage();
     int GetMinPage();
 

-    bool Ok();
+    bool IsOk();
+    %pythoncode { Ok = IsOk }

     void SetOk(bool ok);
 
     virtual bool Print(bool interactive);
     virtual void DetermineScaling();
 
     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`");
+    %property(Frame, GetFrame, SetFrame, doc="See `GetFrame` and `SetFrame`");
+    %property(MaxPage, GetMaxPage, doc="See `GetMaxPage`");
+    %property(MinPage, GetMinPage, doc="See `GetMinPage`");
+    %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`");
+    %property(Printout, GetPrintout, SetPrintout, doc="See `GetPrintout` and `SetPrintout`");
+    %property(PrintoutForPrinting, GetPrintoutForPrinting, doc="See `GetPrintoutForPrinting`");
+    %property(Zoom, GetZoom, SetZoom, doc="See `GetZoom` and `SetZoom`");

 };
 
 
 };
 
 


@@ -717,7 +824,7 @@ class wxPyPrintPreview : public wxPrintPreview
 public:
     %disownarg(wxPyPrintout*);
 
 public:
     %disownarg(wxPyPrintout*);
 

-    %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
+    %pythonAppend wxPyPrintPreview   setCallbackInfo(PyPrintPreview)

     %nokwargs wxPyPrintPreview;
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
     %nokwargs wxPyPrintPreview;
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,


@@ -787,7 +894,8 @@ MustHaveApp(wxPyPreviewFrame);
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
 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,
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,


@@ -847,7 +955,7 @@ MustHaveApp(wxPyPreviewControlBar);
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:
 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,
 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,