fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / wxPython / src / msw / printfw.py

diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py
index ec84101cd82c5d0ac9b23c3bad37ed24087755d4..bafd68b0211be6baa1dce3ebee03ce6099ced91b 100644 (file)
--- a/wxPython/src/msw/printfw.py
+++ b/wxPython/src/msw/printfw.py
@@ -19,7 +19,7 @@ from controls import *
 
 from events import *
 import wx
 
 from events import *
 import wx

-class wxPrintDataPtr :
+class wxPrintDataPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -176,7 +176,7 @@ def wxPrinterDC2(*_args,**_kwargs):
     return val
 
 
     return val
 
 

-class wxPageSetupDialogDataPtr :
+class wxPageSetupDialogDataPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -305,7 +305,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
 
 
 
 
 
 

-class wxPrintDialogDataPtr :
+class wxPrintDialogDataPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -399,7 +399,6 @@ class wxPrintDialogPtr(wxDialogPtr):
         return val
     def GetPrintDC(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs)
         return val
     def GetPrintDC(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs)

-        if val: val = wxDCPtr(val) ; val.thisown = 1

         return val
     def ShowModal(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs)
         return val
     def ShowModal(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs)


@@ -415,7 +414,7 @@ class wxPrintDialog(wxPrintDialogPtr):
 
 
 
 
 
 

-class wxPrintoutPtr :
+class wxPrintoutPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -427,7 +426,6 @@ class wxPrintoutPtr :
         return val
     def GetDC(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)
         return val
     def GetDC(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)

-        if val: val = wxDCPtr(val) 

         return val
     def GetPageSizeMM(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs)
         return val
     def GetPageSizeMM(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs)


@@ -476,7 +474,7 @@ class wxPrintout(wxPrintoutPtr):
 
 
 
 
 
 

-class wxPrinterPtr :
+class wxPrinterPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -495,7 +493,6 @@ class wxPrinterPtr :
         return val
     def PrintDialog(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs)
         return val
     def PrintDialog(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs)

-        if val: val = wxDCPtr(val) 

         return val
     def ReportError(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs)
         return val
     def ReportError(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs)


@@ -513,20 +510,18 @@ class wxPrinter(wxPrinterPtr):
 
 
 
 
 
 

-class wxPrintPreviewPtr :
+class wxPrintPreviewPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetCanvas(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs)
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def GetCanvas(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs)

-        if val: val = wxWindowPtr(val) 

         return val
     def GetCurrentPage(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs)
         return val
     def GetFrame(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs)
         return val
     def GetCurrentPage(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs)
         return val
     def GetFrame(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs)

-        if val: val = wxFramePtr(val) 

         return val
     def GetMaxPage(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs)
         return val
     def GetMaxPage(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs)


@@ -540,11 +535,9 @@ class wxPrintPreviewPtr :
         return val
     def GetPrintout(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs)
         return val
     def GetPrintout(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs)

-        if val: val = wxPrintoutPtr(val) 

         return val
     def GetPrintoutForPrinting(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs)
         return val
     def GetPrintoutForPrinting(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs)

-        if val: val = wxPrintoutPtr(val) 

         return val
     def GetZoom(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetZoom,(self,) + _args, _kwargs)
         return val
     def GetZoom(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintPreview_GetZoom,(self,) + _args, _kwargs)