From 55811cde2d57fdfe78eee3d1adcdff1ddc5cb719 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 28 Oct 2006 02:58:17 +0000 Subject: [PATCH] daily updates and tweaks git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/_printfw.i | 20 ++++++++++++++++++++ wxPython/src/_toplvl.i | 12 +++--------- wxPython/src/_xmlhandler.i | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i index 570bb5355c..51ff10f048 100644 --- a/wxPython/src/_printfw.i +++ b/wxPython/src/_printfw.i @@ -495,6 +495,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), @@ -515,6 +532,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); diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i index 7578a8f837..4a95c46301 100644 --- a/wxPython/src/_toplvl.i +++ b/wxPython/src/_toplvl.i @@ -130,6 +130,9 @@ public: virtual void SetTitle(const wxString& title); virtual wxString GetTitle() const; + // enable/disable close button [x] + virtual bool EnableCloseButton(bool enable ); + // Set the shape of the window to the given region. // Returns True if the platform supports this feature // (and the operation is successful.) @@ -168,15 +171,6 @@ public: "Center the window on screen", ""); %pythoncode { CentreOnScreen = CenterOnScreen } -#ifdef __WXMSW__ - bool EnableCloseButton(bool enable = true); -#else - %extend { - bool EnableCloseButton(bool enable = true) { return false; } - } -#endif - - DocDeclStr( virtual wxWindow *, GetDefaultItem() const, diff --git a/wxPython/src/_xmlhandler.i b/wxPython/src/_xmlhandler.i index 984508ed0d..b791fa185e 100644 --- a/wxPython/src/_xmlhandler.i +++ b/wxPython/src/_xmlhandler.i @@ -24,7 +24,7 @@ class wxPyXmlResourceHandler : public wxXmlResourceHandler { public: wxPyXmlResourceHandler() : wxXmlResourceHandler() {} - //~wxPyXmlResourceHandler(); + ~wxPyXmlResourceHandler() {} // Base class virtuals -- 2.45.2