X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b9f434ef364731ccf6e4ebf78b8cf71d3c85b79..0a95d3369e08206a43032472418693f7726591e5:/wxPython/src/_printfw.i?ds=sidebyside diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i index 1e3c1fc7b9..a70f85a6c6 100644 --- a/wxPython/src/_printfw.i +++ b/wxPython/src/_printfw.i @@ -69,8 +69,10 @@ public: int GetNoCopies(); bool GetCollate(); int GetOrientation(); - - bool Ok(); + bool IsOrientationReversed() const; + + bool IsOk(); + %pythoncode { Ok = IsOk } const wxString& GetPrinterName(); bool GetColour(); @@ -81,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); @@ -94,17 +98,47 @@ 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; + //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(); @@ -123,7 +157,21 @@ public: void SetPrinterTranslateX(long x); void SetPrinterTranslateY(long y); 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`"); }; //--------------------------------------------------------------------------- @@ -133,6 +181,7 @@ public: %nokwargs wxPageSetupDialogData; wxPageSetupDialogData(); wxPageSetupDialogData(const wxPageSetupDialogData& data); // for making copies + wxPageSetupDialogData(const wxPrintData& data); ~wxPageSetupDialogData(); void EnableHelp(bool flag); @@ -140,6 +189,7 @@ public: void EnableOrientation(bool flag); void EnablePaper(bool flag); void EnablePrinter(bool flag); + bool GetDefaultMinMargins(); bool GetEnableMargins(); bool GetEnableOrientation(); @@ -155,13 +205,9 @@ public: wxSize GetPaperSize(); wxPrintData& GetPrintData(); -// %addmethods { -// %new wxPrintData* GetPrintData() { -// return new wxPrintData(self->GetPrintData()); // force a copy -// } -// } - bool Ok(); + bool IsOk(); + %pythoncode { Ok = IsOk } void SetDefaultInfo(bool flag); void SetDefaultMinMargins(bool flag); @@ -171,23 +217,60 @@ public: void SetMinMarginBottomRight(const wxPoint& pt); void SetPaperId(wxPaperSize id); void SetPaperSize(const wxSize& size); + void SetPrintData(const wxPrintData& printData); - %pythoncode { def __nonzero__(self): return self.Ok() } + // 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.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`"); + }; +// 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 wxDialog { +class wxPageSetupDialog : public wxObject +{ public: - %pythonAppend wxPageSetupDialog "self._setOORInfo(self)" - wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL); - + ~wxPageSetupDialog(); + wxPageSetupDialogData& GetPageSetupData(); + wxPageSetupDialogData& GetPageSetupDialogData(); int ShowModal(); + + %pythoncode { def Destroy(self): pass } + + %property(PageSetupData, GetPageSetupData, doc="See `GetPageSetupData`"); + %property(PageSetupDialogData, GetPageSetupDialogData, doc="See `GetPageSetupDialogData`"); + }; //--------------------------------------------------------------------------- @@ -197,7 +280,8 @@ class wxPrintDialogData : public wxObject { public: %nokwargs wxPrintDialogData; wxPrintDialogData(); - wxPrintDialogData(const wxPrintData& printData); // for making copies + wxPrintDialogData(const wxPrintData& printData); + wxPrintDialogData(const wxPrintDialogData& printData); // for making copies ~wxPrintDialogData(); int GetFromPage() const; @@ -211,9 +295,10 @@ public: bool GetPrintToFile() 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); @@ -235,13 +320,29 @@ 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`"); +// %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`"); }; @@ -258,6 +359,8 @@ public: wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL); // TODO?: wxPrintDialog(wxWindow *parent, wxPrintData* data); + + ~wxPrintDialog(); virtual int ShowModal(); @@ -267,6 +370,11 @@ public: %newobject GetPrintDC; 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`"); }; @@ -300,6 +408,9 @@ public: bool GetAbort(); static wxPrinterError GetLastError(); + + %property(Abort, GetAbort, doc="See `GetAbort`"); + %property(PrintDialogData, GetPrintDialogData, doc="See `GetPrintDialogData`"); }; @@ -316,7 +427,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p 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) { @@ -352,9 +463,6 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); } -void wxPyPrintout::base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) { - wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo); -} IMP_PYCALLBACK_BOOL_INTINT(wxPyPrintout, wxPrintout, OnBeginDocument); @@ -372,13 +480,18 @@ 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)" + %pythonAppend wxPyPrintout setCallbackInfo(Printout) + %typemap(out) wxPyPrintout*; // turn off this typemap wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr); - //~wxPyPrintout(); wxPrintPreview object takes ownership... + ~wxPyPrintout(); + // Turn it back on again + %typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, $owner); } + void _setCallbackInfo(PyObject* self, PyObject* _class); @@ -386,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), @@ -406,19 +536,37 @@ public: void, GetPPIPrinter(int *OUTPUT, int *OUTPUT), "GetPPIPrinter() -> (x,y)"); + void SetPaperRectPixels(const wxRect& paperRectPixels); + wxRect GetPaperRectPixels() const; + bool IsPreview(); void SetIsPreview(bool p); - bool base_OnBeginDocument(int startPage, int endPage); - void base_OnEndDocument(); - void base_OnBeginPrinting(); - void base_OnEndPrinting(); - void base_OnPreparePrinting(); - bool base_HasPage(int page); + bool OnBeginDocument(int startPage, int endPage); + void OnEndDocument(); + void OnBeginPrinting(); + void OnEndPrinting(); + void OnPreparePrinting(); + bool HasPage(int page); DocDeclA( - void, base_GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT), - "base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"); + void, GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT), + "GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"); + + %MAKE_BASE_FUNC(Printout, OnBeginDocument); + %MAKE_BASE_FUNC(Printout, OnEndDocument); + %MAKE_BASE_FUNC(Printout, OnBeginPrinting); + %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`"); }; //--------------------------------------------------------------------------- @@ -445,19 +593,24 @@ MustHaveApp(wxPreviewFrame); class wxPreviewFrame : public wxFrame { public: + %disownarg(wxPrintPreview*); + %pythonAppend wxPreviewFrame "self._setOORInfo(self)" - wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxPyFrameNameStr); + %cleardisown(wxPrintPreview*); + void Initialize(); void CreateControlBar(); void CreateCanvas(); wxPreviewControlBar* GetControlBar() const; + + %property(ControlBar, GetControlBar, doc="See `GetControlBar`"); }; @@ -506,6 +659,9 @@ public: void OnFirst(); void OnLast(); void OnGoto(); + + %property(PrintPreview, GetPrintPreview, doc="See `GetPrintPreview`"); + %property(ZoomControl, GetZoomControl, SetZoomControl, doc="See `GetZoomControl` and `SetZoomControl`"); }; @@ -516,6 +672,8 @@ MustHaveApp(wxPrintPreview); class wxPrintPreview : public wxObject { public: + %disownarg(wxPyPrintout*); + %nokwargs wxPrintPreview; wxPrintPreview(wxPyPrintout* printout, wxPyPrintout* printoutForPrinting, @@ -524,6 +682,8 @@ public: wxPyPrintout* printoutForPrinting, wxPrintData* data); + ~wxPrintPreview(); + virtual bool SetCurrentPage(int pageNum); int GetCurrentPage(); @@ -531,6 +691,8 @@ public: wxPyPrintout *GetPrintout(); wxPyPrintout *GetPrintoutForPrinting(); + %cleardisown(wxPyPrintout*); + void SetFrame(wxFrame *frame); void SetCanvas(wxPreviewCanvas *canvas); @@ -557,13 +719,24 @@ 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`"); + %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`"); }; @@ -575,15 +748,14 @@ public: %{ #define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME) \ - bool CBNAME(wxPreviewCanvas* a, wxDC& b); \ - bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b) + bool 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(); \ + wxPyBlock_t blocked = wxPyBeginBlockThreads(); \ if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) { \ PyObject* win = wxPyMake_wxObject(a,false); \ PyObject* dc = wxPyMake_wxObject(&b,false); \ @@ -595,10 +767,7 @@ public: if (! found) \ rval = PCLASS::CBNAME(a, b); \ return rval; \ - } \ - bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) { \ - return PCLASS::CBNAME(a, b); \ - } + } @@ -614,7 +783,7 @@ public: {} wxPyPrintPreview(wxPyPrintout* printout, wxPyPrintout* printoutForPrinting, - wxPrintData* data=NULL) + wxPrintData* data) : wxPrintPreview(printout, printoutForPrinting, data) {} @@ -653,7 +822,9 @@ MustHaveApp(wxPyPrintPreview); class wxPyPrintPreview : public wxPrintPreview { public: - %pythonAppend wxPyPrintPreview "self._setCallbackInfo(self, PyPrintPreview)" + %disownarg(wxPyPrintout*); + + %pythonAppend wxPyPrintPreview setCallbackInfo(PyPrintPreview) %nokwargs wxPyPrintPreview; wxPyPrintPreview(wxPyPrintout* printout, wxPyPrintout* printoutForPrinting, @@ -662,15 +833,25 @@ public: wxPyPrintout* printoutForPrinting, wxPrintData* data); + %cleardisown(wxPyPrintout*); + void _setCallbackInfo(PyObject* self, PyObject* _class); - bool base_SetCurrentPage(int pageNum); - bool base_PaintPage(wxPreviewCanvas *canvas, wxDC& dc); - bool base_DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc); - bool base_RenderPage(int pageNum); - void base_SetZoom(int percent); - bool base_Print(bool interactive); - void base_DetermineScaling(); + bool SetCurrentPage(int pageNum); + bool PaintPage(wxPreviewCanvas *canvas, wxDC& dc); + bool DrawBlankPage(wxPreviewCanvas *canvas, wxDC& dc); + bool RenderPage(int pageNum); + void SetZoom(int percent); + bool Print(bool interactive); + void DetermineScaling(); + + %MAKE_BASE_FUNC(PyPrintPreview, SetCurrentPage); + %MAKE_BASE_FUNC(PyPrintPreview, PaintPage); + %MAKE_BASE_FUNC(PyPrintPreview, DrawBlankPage); + %MAKE_BASE_FUNC(PyPrintPreview, RenderPage); + %MAKE_BASE_FUNC(PyPrintPreview, SetZoom); + %MAKE_BASE_FUNC(PyPrintPreview, Print); + %MAKE_BASE_FUNC(PyPrintPreview, DetermineScaling); }; @@ -679,7 +860,7 @@ public: %{ class wxPyPreviewFrame : public wxPreviewFrame { - DECLARE_CLASS(wxPyPreviewFrame); + DECLARE_CLASS(wxPyPreviewFrame) public: wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title, @@ -713,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, @@ -727,9 +909,13 @@ public: void SetPreviewCanvas(wxPreviewCanvas* canvas); void SetControlBar(wxPreviewControlBar* bar); - void base_Initialize(); - void base_CreateCanvas(); - void base_CreateControlBar(); + void Initialize(); + void CreateCanvas(); + void CreateControlBar(); + + %MAKE_BASE_FUNC(PyPreviewFrame, Initialize); + %MAKE_BASE_FUNC(PyPreviewFrame, CreateCanvas); + %MAKE_BASE_FUNC(PyPreviewFrame, CreateControlBar); }; @@ -738,7 +924,7 @@ public: %{ class wxPyPreviewControlBar : public wxPreviewControlBar { - DECLARE_CLASS(wxPyPreviewControlBar); + DECLARE_CLASS(wxPyPreviewControlBar) public: wxPyPreviewControlBar(wxPrintPreview *preview, long buttons, @@ -769,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, @@ -783,8 +969,11 @@ public: void SetPrintPreview(wxPrintPreview* preview); - void base_CreateButtons(); - void base_SetZoomControl(int zoom); + void CreateButtons(); + void SetZoomControl(int zoom); + + %MAKE_BASE_FUNC(PreviewControlBar, CreateButtons); + %MAKE_BASE_FUNC(PreviewControlBar, SetZoomControl); }; //---------------------------------------------------------------------------