X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32eb53cbe7947f3f4599d7b6b5caa21a68d27f..2091f5e71a1d04cf9277565121725f764d466a06:/wxPython/src/_printfw.i?ds=sidebyside diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i index e81578d220..b4911ce8fd 100644 --- a/wxPython/src/_printfw.i +++ b/wxPython/src/_printfw.i @@ -36,11 +36,34 @@ enum wxPrintMode wxPRINT_MODE_STREAM = 4 // Send postscript data into a stream }; +enum wxPrintBin +{ + wxPRINTBIN_DEFAULT, + + wxPRINTBIN_ONLYONE, + wxPRINTBIN_LOWER, + wxPRINTBIN_MIDDLE, + wxPRINTBIN_MANUAL, + wxPRINTBIN_ENVELOPE, + wxPRINTBIN_ENVMANUAL, + wxPRINTBIN_AUTO, + wxPRINTBIN_TRACTOR, + wxPRINTBIN_SMALLFMT, + wxPRINTBIN_LARGEFMT, + wxPRINTBIN_LARGECAPACITY, + wxPRINTBIN_CASSETTE, + wxPRINTBIN_FORMSOURCE, + + wxPRINTBIN_USER, +}; class wxPrintData : public wxObject { public: + %nokwargs wxPrintData; wxPrintData(); + wxPrintData(const wxPrintData& data); // for making copies + ~wxPrintData(); int GetNoCopies(); @@ -56,7 +79,9 @@ public: const wxSize& GetPaperSize(); int GetQuality(); - + wxPrintBin GetBin(); + wxPrintMode GetPrintMode() const; + void SetNoCopies(int v); void SetCollate(bool flag); void SetOrientation(int orient); @@ -67,23 +92,59 @@ public: void SetPaperId(wxPaperSize sizeId); void SetPaperSize(const wxSize& sz); void SetQuality(int quality); + void SetBin(wxPrintBin bin); + void SetPrintMode(wxPrintMode printMode); + + wxString GetFilename() const; + void SetFilename( const wxString &filename ); + + %pythoncode { def __nonzero__(self): return self.Ok() } + + //char* GetPrivData() const; + //int GetPrivDataLen() const; + //void SetPrivData( char *privData, int len ); + + %extend { + PyObject* GetPrivData() { + PyObject* data; + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + data = PyString_FromStringAndSize(self->GetPrivData(), + self->GetPrivDataLen()); + wxPyEndBlockThreads(blocked); + return data; + } + + void SetPrivData(PyObject* data) { + if (! PyString_Check(data)) { + wxPyBLOCK_THREADS(PyErr_SetString(PyExc_TypeError, + "Expected string object")); + return /* NULL */ ; + } + + wxPyBlock_t blocked = wxPyBeginBlockThreads(); + self->SetPrivData(PyString_AS_STRING(data), PyString_GET_SIZE(data)); + wxPyEndBlockThreads(blocked); + } + } + + // NOTE: These are now inside of #if WXWIN_COMPATIBILITY_2_4, so be + // prepared to remove them... + // PostScript-specific data +// WXWIN_COMPATIBILITY_2_4 +#if 0 const wxString& GetPrinterCommand(); const wxString& GetPrinterOptions(); const wxString& GetPreviewCommand(); - const wxString& GetFilename(); const wxString& GetFontMetricPath(); double GetPrinterScaleX(); double GetPrinterScaleY(); long GetPrinterTranslateX(); long GetPrinterTranslateY(); - wxPrintMode GetPrintMode(); - void SetPrinterCommand(const wxString& command); void SetPrinterOptions(const wxString& options); void SetPreviewCommand(const wxString& command); - void SetFilename(const wxString& filename); void SetFontMetricPath(const wxString& path); void SetPrinterScaleX(double x); void SetPrinterScaleY(double y); @@ -91,19 +152,18 @@ public: void SetPrinterTranslateX(long x); void SetPrinterTranslateY(long y); void SetPrinterTranslation(long x, long y); - void SetPrintMode(wxPrintMode printMode); - - wxOutputStream* GetOutputStream(); - void SetOutputStream(wxOutputStream* outputstream); +#endif - %pythoncode { def __nonzero__(self): return self.Ok() } }; //--------------------------------------------------------------------------- class wxPageSetupDialogData : public wxObject { public: + %nokwargs wxPageSetupDialogData; wxPageSetupDialogData(); + wxPageSetupDialogData(const wxPageSetupDialogData& data); // for making copies + wxPageSetupDialogData(const wxPrintData& data); ~wxPageSetupDialogData(); void EnableHelp(bool flag); @@ -111,6 +171,7 @@ public: void EnableOrientation(bool flag); void EnablePaper(bool flag); void EnablePrinter(bool flag); + bool GetDefaultMinMargins(); bool GetEnableMargins(); bool GetEnableOrientation(); @@ -126,11 +187,6 @@ public: wxSize GetPaperSize(); wxPrintData& GetPrintData(); -// %addmethods { -// %new wxPrintData* GetPrintData() { -// return new wxPrintData(self->GetPrintData()); // force a copy -// } -// } bool Ok(); @@ -142,20 +198,34 @@ public: void SetMinMarginBottomRight(const wxPoint& pt); void SetPaperId(wxPaperSize id); void SetPaperSize(const wxSize& size); + void SetPrintData(const wxPrintData& printData); + // Use paper size defined in this object to set the wxPrintData + // paper id + void CalculateIdFromPaperSize(); + + // Use paper id in wxPrintData to set this object's paper size + void CalculatePaperSizeFromId(); + %pythoncode { def __nonzero__(self): return self.Ok() } }; -class wxPageSetupDialog : public wxDialog { -public: - %pythonAppend wxPageSetupDialog "self._setOORInfo(self)" +// NOTE: Contrary to it's name, this class doesn't derive from wxDialog. It +// is a facade in front of a platform-specific (native dialog) provided by the +// wxPrintFactory. + +MustHaveApp(wxPageSetupDialog); +class wxPageSetupDialog : public wxObject +{ +public: wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL); wxPageSetupDialogData& GetPageSetupData(); + wxPageSetupDialogData& GetPageSetupDialogData(); int ShowModal(); }; @@ -167,6 +237,7 @@ public: %nokwargs wxPrintDialogData; wxPrintDialogData(); wxPrintDialogData(const wxPrintData& printData); + wxPrintDialogData(const wxPrintDialogData& printData); // for making copies ~wxPrintDialogData(); int GetFromPage() const; @@ -178,8 +249,12 @@ public: bool GetSelection() const; bool GetCollate() const; bool GetPrintToFile() const; - bool GetSetupDialog() const; + // WXWIN_COMPATIBILITY_2_4 +#if 0 + bool GetSetupDialog() const; + void SetSetupDialog(bool flag); +#endif void SetFromPage(int v); void SetToPage(int v); void SetMinPage(int v); @@ -189,7 +264,6 @@ public: void SetSelection(bool flag); void SetCollate(bool flag); void SetPrintToFile(bool flag); - void SetSetupDialog(bool flag); void EnablePrintToFile(bool flag); void EnableSelection(bool flag); @@ -206,28 +280,34 @@ public: wxPrintData& GetPrintData(); -// %addmethods { -// %new wxPrintData* GetPrintData() { -// return new wxPrintData(self->GetPrintData()); // force a copy -// } -// } void SetPrintData(const wxPrintData& printData); %pythoncode { def __nonzero__(self): return self.Ok() } }; -class wxPrintDialog : public wxDialog { -public: - %pythonAppend wxPrintDialog "self._setOORInfo(self)" +MustHaveApp(wxPrintDialog); + + +// NOTE: Contrary to it's name, this class doesn't derive from wxDialog. It +// is a facade in front of a platform-specific (native dialog) provided by the +// wxPrintFactory. + +class wxPrintDialog : public wxObject { +public: wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL); - wxPrintDialogData& GetPrintDialogData(); + // TODO?: wxPrintDialog(wxWindow *parent, wxPrintData* data); + + virtual int ShowModal(); + + virtual wxPrintDialogData& GetPrintDialogData(); + virtual wxPrintData& GetPrintData(); %newobject GetPrintDC; - wxDC* GetPrintDC(); - int ShowModal(); + virtual wxDC *GetPrintDC(); + }; @@ -243,34 +323,41 @@ enum wxPrinterError }; +MustHaveApp(wxPrinter); + class wxPrinter : public wxObject { public: wxPrinter(wxPrintDialogData* data = NULL); ~wxPrinter(); - void CreateAbortWindow(wxWindow* parent, wxPyPrintout* printout); - wxPrintDialogData& GetPrintDialogData(); - bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=True); - wxDC* PrintDialog(wxWindow *parent); - void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message); - bool Setup(wxWindow *parent); - bool GetAbort(); + virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPyPrintout *printout); + virtual void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message); + + virtual bool Setup(wxWindow *parent); + virtual bool Print(wxWindow *parent, wxPyPrintout *printout, bool prompt = true); + virtual wxDC* PrintDialog(wxWindow *parent); + + virtual wxPrintDialogData& GetPrintDialogData() const; + bool GetAbort(); static wxPrinterError GetLastError(); }; //--------------------------------------------------------------------------- -// Custom wxPrintout class that knows how to call python +// Custom wxPrintout class that knows how to call python, See implementation in +// include/sx/wxPython/printfw.h + %{ +IMPLEMENT_ABSTRACT_CLASS(wxPyPrintout, wxPrintout); // Since this one would be tough and ugly to do with the Macros... void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { - bool hadErr = False; + bool hadErr = false; bool found; - bool blocked = wxPyBeginBlockThreads(); + wxPyBlock_t blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) { PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()")); if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) { @@ -278,22 +365,22 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p val = PyTuple_GetItem(result, 0); if (PyInt_Check(val)) *minPage = PyInt_AsLong(val); - else hadErr = True; + else hadErr = true; val = PyTuple_GetItem(result, 1); if (PyInt_Check(val)) *maxPage = PyInt_AsLong(val); - else hadErr = True; + else hadErr = true; val = PyTuple_GetItem(result, 2); if (PyInt_Check(val)) *pageFrom = PyInt_AsLong(val); - else hadErr = True; + else hadErr = true; val = PyTuple_GetItem(result, 3); if (PyInt_Check(val)) *pageTo = PyInt_AsLong(val); - else hadErr = True; + else hadErr = true; } else - hadErr = True; + hadErr = true; if (hadErr) { PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers."); @@ -323,8 +410,11 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage); %} +MustHaveApp(wxPyPrintout); + // Now define the custom class for SWIGging -%name(Printout) class wxPyPrintout : public wxObject { +%rename(Printout) wxPyPrintout; +class wxPyPrintout : public wxObject { public: %pythonAppend wxPyPrintout "self._setCallbackInfo(self, Printout)" @@ -377,6 +467,8 @@ public: +MustHaveApp(wxPreviewCanvas); + class wxPreviewCanvas: public wxScrolledWindow { public: @@ -391,6 +483,8 @@ public: }; +MustHaveApp(wxPreviewFrame); + class wxPreviewFrame : public wxFrame { public: %pythonAppend wxPreviewFrame "self._setOORInfo(self)" @@ -430,6 +524,8 @@ enum { wxID_PREVIEW_GOTO }; +MustHaveApp(wxPreviewControlBar); + class wxPreviewControlBar: public wxPanel { public: @@ -458,6 +554,8 @@ public: //--------------------------------------------------------------------------- +MustHaveApp(wxPrintPreview); + class wxPrintPreview : public wxObject { public: %nokwargs wxPrintPreview; @@ -518,30 +616,30 @@ public: %{ -#define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME) \ - bool CBNAME(wxPreviewCanvas* a, wxDC& b); \ +#define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME) \ + bool CBNAME(wxPreviewCanvas* a, wxDC& b); \ bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b) -#define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME) \ - bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \ - bool rval=False; \ - bool found; \ - bool blocked = wxPyBeginBlockThreads(); \ - if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ - PyObject* win = wxPyMake_wxObject(a); \ - PyObject* dc = wxPyMake_wxObject(&b); \ - rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\ - Py_DECREF(win); \ - Py_DECREF(dc); \ - } \ - wxPyEndBlockThreads(blocked); \ - if (! found) \ - rval = PCLASS::CBNAME(a, b); \ - return rval; \ - } \ - bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) { \ - return PCLASS::CBNAME(a, b); \ +#define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME) \ + bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) { \ + bool rval=false; \ + bool found; \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ + if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ + PyObject* win = wxPyMake_wxObject(a,false); \ + PyObject* dc = wxPyMake_wxObject(&b,false); \ + rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc)); \ + Py_DECREF(win); \ + Py_DECREF(dc); \ + } \ + wxPyEndBlockThreads(blocked); \ + if (! found) \ + rval = PCLASS::CBNAME(a, b); \ + return rval; \ + } \ + bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) { \ + return PCLASS::CBNAME(a, b); \ } @@ -592,6 +690,8 @@ IMP_PYCALLBACK_VOID_ (wxPyPrintPreview, wxPrintPreview, DetermineScaling) %} +MustHaveApp(wxPyPrintPreview); + class wxPyPrintPreview : public wxPrintPreview { public: @@ -650,6 +750,8 @@ IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateControlBar); %} +MustHaveApp(wxPyPreviewFrame); + class wxPyPreviewFrame : public wxPreviewFrame { public: @@ -704,6 +806,8 @@ IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomContr %} +MustHaveApp(wxPyPreviewControlBar); + class wxPyPreviewControlBar : public wxPreviewControlBar { public: @@ -725,7 +829,6 @@ public: void base_SetZoomControl(int zoom); }; - //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- %init %{