added functions to read/write several elements at once (patch 754986)

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

diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py
index 299b250ab699a76f37bbc61e3368619df029562e..ba11c954283967458bf4954d4ae2c4de09a46d86 100644 (file)
--- a/wxPython/src/msw/printfw.py
+++ b/wxPython/src/msw/printfw.py
@@ -25,9 +25,12 @@ class wxPrintDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,printfwc=printfwc):
-        if self.thisown == 1 :
-            printfwc.delete_wxPrintData(self)
+    def __del__(self, delfunc=printfwc.delete_wxPrintData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def GetNoCopies(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs)
         return val
@@ -201,19 +204,17 @@ class wxPostScriptDC(wxPostScriptDCPtr):
 
 
 
-def wxPostScriptDC2(*_args,**_kwargs):
-    val = wxPostScriptDCPtr(apply(printfwc.new_wxPostScriptDC2,_args,_kwargs))
-    val.thisown = 1
-    return val
-
 
 class wxPageSetupDialogDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,printfwc=printfwc):
-        if self.thisown == 1 :
-            printfwc.delete_wxPageSetupDialogData(self)
+    def __del__(self, delfunc=printfwc.delete_wxPageSetupDialogData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableHelp(self, *_args, **_kwargs):
         val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs)
         return val
@@ -343,9 +344,12 @@ class wxPrintDialogDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,printfwc=printfwc):
-        if self.thisown == 1 :
-            printfwc.delete_wxPrintDialogData(self)
+    def __del__(self, delfunc=printfwc.delete_wxPrintDialogData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def EnableHelp(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs)
         return val
@@ -515,9 +519,12 @@ class wxPrinterPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
-    def __del__(self,printfwc=printfwc):
-        if self.thisown == 1 :
-            printfwc.delete_wxPrinter(self)
+    def __del__(self, delfunc=printfwc.delete_wxPrinter):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
     def CreateAbortWindow(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs)
         return val