Need to navigate to "about:blank" in order for the internal docuemnt

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 55ddfca1b1cbcfe4d5ecb8c1390c76973d79c8f4..fd6a356b947cb7cc25335b98316fb591fefe6e29 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -32,7 +32,8 @@ enum wxPrintMode
     wxPRINT_MODE_NONE =    0,
     wxPRINT_MODE_PREVIEW = 1,   // Preview in external application
     wxPRINT_MODE_FILE =    2,   // Print to file
     wxPRINT_MODE_NONE =    0,
     wxPRINT_MODE_PREVIEW = 1,   // Preview in external application
     wxPRINT_MODE_FILE =    2,   // Print to file

-    wxPRINT_MODE_PRINTER = 3    // Send to printer
+    wxPRINT_MODE_PRINTER = 3,   // Send to printer
+    wxPRINT_MODE_STREAM = 4     // Send postscript data into a stream 

 };
 
 
 };
 
 


@@ -92,6 +93,9 @@ public:
     void SetPrinterTranslation(long x, long y);
     void SetPrintMode(wxPrintMode printMode);
 
     void SetPrinterTranslation(long x, long y);
     void SetPrintMode(wxPrintMode printMode);
 

+    wxOutputStream* GetOutputStream();
+    void SetOutputStream(wxOutputStream* outputstream);
+

     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 


@@ -147,7 +151,7 @@ public:
 
 class wxPageSetupDialog : public wxDialog {
 public:
 
 class wxPageSetupDialog : public wxDialog {
 public:

-    %addtofunc wxPageSetupDialog         "self._setOORInfo(self)"
+    %pythonAppend wxPageSetupDialog         "self._setOORInfo(self)"

 
     wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL);
 
 
     wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL);
 


@@ -160,7 +164,9 @@ public:
 
 class wxPrintDialogData : public wxObject {
 public:
 
 class wxPrintDialogData : public wxObject {
 public:

+    %nokwargs wxPrintDialogData;

     wxPrintDialogData();
     wxPrintDialogData();

+    wxPrintDialogData(const wxPrintData& printData);

     ~wxPrintDialogData();
 
     int GetFromPage() const;
     ~wxPrintDialogData();
 
     int GetFromPage() const;


@@ -213,7 +219,7 @@ public:
 
 class wxPrintDialog : public wxDialog {
 public:
 
 class wxPrintDialog : public wxDialog {
 public:

-    %addtofunc wxPrintDialog         "self._setOORInfo(self)"
+    %pythonAppend wxPrintDialog         "self._setOORInfo(self)"

 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 
 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 


@@ -320,7 +326,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 // Now define the custom class for SWIGging
 %name(Printout) class wxPyPrintout  : public wxObject {
 public:
 // Now define the custom class for SWIGging
 %name(Printout) class wxPyPrintout  : public wxObject {
 public:

-    %addtofunc wxPyPrintout   "self._setCallbackInfo(self, Printout)"
+    %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"

 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
     //~wxPyPrintout();      wxPrintPreview object takes ownership...
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
     //~wxPyPrintout();      wxPrintPreview object takes ownership...


@@ -374,7 +380,7 @@ public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:

-    %addtofunc wxPreviewCanvas   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewCanvas   "self._setOORInfo(self)"

 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,
 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,


@@ -387,7 +393,7 @@ public:
 
 class wxPreviewFrame : public wxFrame {
 public:
 
 class wxPreviewFrame : public wxFrame {
 public:

-    %addtofunc wxPreviewFrame   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewFrame   "self._setOORInfo(self)"

 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,


@@ -427,7 +433,7 @@ enum {
 class wxPreviewControlBar: public wxPanel
 {
 public:
 class wxPreviewControlBar: public wxPanel
 {
 public:

-    %addtofunc wxPreviewControlBar   "self._setOORInfo(self)"
+    %pythonAppend wxPreviewControlBar   "self._setOORInfo(self)"

 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,
 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,


@@ -454,9 +460,13 @@ public:
 
 class wxPrintPreview : public wxObject {
 public:
 
 class wxPrintPreview : public wxObject {
 public:

+    %nokwargs wxPrintPreview;

     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,
     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,

-                   wxPrintData* data=NULL);
+                   wxPrintDialogData *data=NULL);
+    wxPrintPreview(wxPyPrintout* printout,
+                  wxPyPrintout* printoutForPrinting,
+                  wxPrintData* data);

 
     virtual bool SetCurrentPage(int pageNum);
     int GetCurrentPage();
 
     virtual bool SetCurrentPage(int pageNum);
     int GetCurrentPage();


@@ -541,6 +551,11 @@ class wxPyPrintPreview : public wxPrintPreview
 {
     DECLARE_CLASS(wxPyPrintPreview)
 public:
 {
     DECLARE_CLASS(wxPyPrintPreview)
 public:

+    wxPyPrintPreview(wxPyPrintout* printout,
+                     wxPyPrintout* printoutForPrinting,
+                     wxPrintDialogData* data=NULL)
+        : wxPrintPreview(printout, printoutForPrinting, data)
+    {}

     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data=NULL)
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data=NULL)


@@ -580,11 +595,14 @@ IMP_PYCALLBACK_VOID_        (wxPyPrintPreview, wxPrintPreview, DetermineScaling)
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:

-    %addtofunc wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
-
+    %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
+    %nokwargs wxPyPrintPreview;
+    wxPyPrintPreview(wxPyPrintout* printout,
+                     wxPyPrintout* printoutForPrinting,
+                     wxPrintDialogData* data=NULL);

     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,

-                     wxPrintData* data=NULL);
+                     wxPrintData* data);

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     


@@ -635,7 +653,7 @@ IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateControlBar);
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:

-    %addtofunc wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"

 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,


@@ -689,7 +707,7 @@ IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomContr
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:

-    %addtofunc wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"

 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,
 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,