wxUniversal STL-ification.

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

diff --git a/wxPython/src/gtk/printfw.py b/wxPython/src/gtk/printfw.py
index f808d8ce145ef1488cc75e983a0285ea811ea0b9..65865b6e339f8eef49a3a26bf9868fd1d2cad552 100644 (file)
--- a/wxPython/src/gtk/printfw.py
+++ b/wxPython/src/gtk/printfw.py
@@ -7,6 +7,8 @@ from windows import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from clip_dnd import *
 
 from cmndlgs import *
 from clip_dnd import *
 
 from cmndlgs import *


@@ -23,135 +25,163 @@ class wxPrintDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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):
     def GetNoCopies(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetNoCopies,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetNoCopies(self, *_args, **_kwargs)

         return val
     def GetCollate(self, *_args, **_kwargs):
         return val
     def GetCollate(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetCollate,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetCollate(self, *_args, **_kwargs)

         return val
     def GetOrientation(self, *_args, **_kwargs):
         return val
     def GetOrientation(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetOrientation,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetOrientation(self, *_args, **_kwargs)
+        return val
+    def Ok(self, *_args, **_kwargs):
+        val = printfwc.wxPrintData_Ok(self, *_args, **_kwargs)

         return val
     def GetPrinterName(self, *_args, **_kwargs):
         return val
     def GetPrinterName(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterName,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterName(self, *_args, **_kwargs)

         return val
     def GetColour(self, *_args, **_kwargs):
         return val
     def GetColour(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetColour,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetColour(self, *_args, **_kwargs)

         return val
     def GetDuplex(self, *_args, **_kwargs):
         return val
     def GetDuplex(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetDuplex,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetDuplex(self, *_args, **_kwargs)

         return val
     def GetPaperId(self, *_args, **_kwargs):
         return val
     def GetPaperId(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPaperId,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPaperId(self, *_args, **_kwargs)

         return val
     def GetPaperSize(self, *_args, **_kwargs):
         return val
     def GetPaperSize(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPaperSize,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPaperSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) 
         return val
     def GetQuality(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) 
         return val
     def GetQuality(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetQuality,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetQuality(self, *_args, **_kwargs)

         return val
     def SetNoCopies(self, *_args, **_kwargs):
         return val
     def SetNoCopies(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetNoCopies,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetNoCopies(self, *_args, **_kwargs)

         return val
     def SetCollate(self, *_args, **_kwargs):
         return val
     def SetCollate(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetCollate,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetCollate(self, *_args, **_kwargs)

         return val
     def SetOrientation(self, *_args, **_kwargs):
         return val
     def SetOrientation(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetOrientation,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetOrientation(self, *_args, **_kwargs)

         return val
     def SetPrinterName(self, *_args, **_kwargs):
         return val
     def SetPrinterName(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterName,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterName(self, *_args, **_kwargs)

         return val
     def SetColour(self, *_args, **_kwargs):
         return val
     def SetColour(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetColour,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetColour(self, *_args, **_kwargs)

         return val
     def SetDuplex(self, *_args, **_kwargs):
         return val
     def SetDuplex(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetDuplex,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetDuplex(self, *_args, **_kwargs)

         return val
     def SetPaperId(self, *_args, **_kwargs):
         return val
     def SetPaperId(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPaperId,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPaperId(self, *_args, **_kwargs)

         return val
     def SetPaperSize(self, *_args, **_kwargs):
         return val
     def SetPaperSize(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPaperSize,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPaperSize(self, *_args, **_kwargs)

         return val
     def SetQuality(self, *_args, **_kwargs):
         return val
     def SetQuality(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetQuality,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetQuality(self, *_args, **_kwargs)

         return val
     def GetPrinterCommand(self, *_args, **_kwargs):
         return val
     def GetPrinterCommand(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterCommand,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterCommand(self, *_args, **_kwargs)

         return val
     def GetPrinterOptions(self, *_args, **_kwargs):
         return val
     def GetPrinterOptions(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterOptions,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterOptions(self, *_args, **_kwargs)

         return val
     def GetPreviewCommand(self, *_args, **_kwargs):
         return val
     def GetPreviewCommand(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPreviewCommand,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPreviewCommand(self, *_args, **_kwargs)

         return val
     def GetFilename(self, *_args, **_kwargs):
         return val
     def GetFilename(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetFilename,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetFilename(self, *_args, **_kwargs)

         return val
     def GetFontMetricPath(self, *_args, **_kwargs):
         return val
     def GetFontMetricPath(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetFontMetricPath,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetFontMetricPath(self, *_args, **_kwargs)

         return val
     def GetPrinterScaleX(self, *_args, **_kwargs):
         return val
     def GetPrinterScaleX(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterScaleX,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterScaleX(self, *_args, **_kwargs)

         return val
     def GetPrinterScaleY(self, *_args, **_kwargs):
         return val
     def GetPrinterScaleY(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterScaleY,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterScaleY(self, *_args, **_kwargs)

         return val
     def GetPrinterTranslateX(self, *_args, **_kwargs):
         return val
     def GetPrinterTranslateX(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterTranslateX,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterTranslateX(self, *_args, **_kwargs)

         return val
     def GetPrinterTranslateY(self, *_args, **_kwargs):
         return val
     def GetPrinterTranslateY(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrinterTranslateY,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrinterTranslateY(self, *_args, **_kwargs)

         return val
     def GetPrintMode(self, *_args, **_kwargs):
         return val
     def GetPrintMode(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_GetPrintMode,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_GetPrintMode(self, *_args, **_kwargs)

         return val
     def SetPrinterCommand(self, *_args, **_kwargs):
         return val
     def SetPrinterCommand(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterCommand,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterCommand(self, *_args, **_kwargs)

         return val
     def SetPrinterOptions(self, *_args, **_kwargs):
         return val
     def SetPrinterOptions(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterOptions,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterOptions(self, *_args, **_kwargs)

         return val
     def SetPreviewCommand(self, *_args, **_kwargs):
         return val
     def SetPreviewCommand(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPreviewCommand,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPreviewCommand(self, *_args, **_kwargs)

         return val
     def SetFilename(self, *_args, **_kwargs):
         return val
     def SetFilename(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetFilename,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetFilename(self, *_args, **_kwargs)

         return val
     def SetFontMetricPath(self, *_args, **_kwargs):
         return val
     def SetFontMetricPath(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetFontMetricPath,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetFontMetricPath(self, *_args, **_kwargs)

         return val
     def SetPrinterScaleX(self, *_args, **_kwargs):
         return val
     def SetPrinterScaleX(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterScaleX,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterScaleX(self, *_args, **_kwargs)

         return val
     def SetPrinterScaleY(self, *_args, **_kwargs):
         return val
     def SetPrinterScaleY(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterScaleY,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterScaleY(self, *_args, **_kwargs)

         return val
     def SetPrinterScaling(self, *_args, **_kwargs):
         return val
     def SetPrinterScaling(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterScaling,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterScaling(self, *_args, **_kwargs)

         return val
     def SetPrinterTranslateX(self, *_args, **_kwargs):
         return val
     def SetPrinterTranslateX(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterTranslateX,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterTranslateX(self, *_args, **_kwargs)

         return val
     def SetPrinterTranslateY(self, *_args, **_kwargs):
         return val
     def SetPrinterTranslateY(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterTranslateY,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterTranslateY(self, *_args, **_kwargs)

         return val
     def SetPrinterTranslation(self, *_args, **_kwargs):
         return val
     def SetPrinterTranslation(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrinterTranslation,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrinterTranslation(self, *_args, **_kwargs)

         return val
     def SetPrintMode(self, *_args, **_kwargs):
         return val
     def SetPrintMode(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintData_SetPrintMode,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintData_SetPrintMode(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintData instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+    def __nonzero__(self): return self.Ok()

 class wxPrintData(wxPrintDataPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrintData(wxPrintDataPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrintData,_args,_kwargs)
+        self.this = printfwc.new_wxPrintData(*_args,**_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPostScriptDCPtr(wxDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetPrintData(self, *_args, **_kwargs):
+        val = printfwc.wxPostScriptDC_GetPrintData(self, *_args, **_kwargs)
+        if val: val = wxPrintDataPtr(val) 
+        return val
+    def SetPrintData(self, *_args, **_kwargs):
+        val = printfwc.wxPostScriptDC_SetPrintData(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPostScriptDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPostScriptDC(wxPostScriptDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPostScriptDC(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -161,104 +191,111 @@ class wxPageSetupDialogDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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):
     def EnableHelp(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_EnableHelp,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_EnableHelp(self, *_args, **_kwargs)

         return val
     def EnableMargins(self, *_args, **_kwargs):
         return val
     def EnableMargins(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_EnableMargins,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_EnableMargins(self, *_args, **_kwargs)

         return val
     def EnableOrientation(self, *_args, **_kwargs):
         return val
     def EnableOrientation(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_EnableOrientation,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_EnableOrientation(self, *_args, **_kwargs)

         return val
     def EnablePaper(self, *_args, **_kwargs):
         return val
     def EnablePaper(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_EnablePaper,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_EnablePaper(self, *_args, **_kwargs)

         return val
     def EnablePrinter(self, *_args, **_kwargs):
         return val
     def EnablePrinter(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_EnablePrinter,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_EnablePrinter(self, *_args, **_kwargs)

         return val
     def GetDefaultMinMargins(self, *_args, **_kwargs):
         return val
     def GetDefaultMinMargins(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetDefaultMinMargins,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetDefaultMinMargins(self, *_args, **_kwargs)

         return val
     def GetEnableMargins(self, *_args, **_kwargs):
         return val
     def GetEnableMargins(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetEnableMargins,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetEnableMargins(self, *_args, **_kwargs)

         return val
     def GetEnableOrientation(self, *_args, **_kwargs):
         return val
     def GetEnableOrientation(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetEnableOrientation,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetEnableOrientation(self, *_args, **_kwargs)

         return val
     def GetEnablePaper(self, *_args, **_kwargs):
         return val
     def GetEnablePaper(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetEnablePaper,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetEnablePaper(self, *_args, **_kwargs)

         return val
     def GetEnablePrinter(self, *_args, **_kwargs):
         return val
     def GetEnablePrinter(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetEnablePrinter,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetEnablePrinter(self, *_args, **_kwargs)

         return val
     def GetEnableHelp(self, *_args, **_kwargs):
         return val
     def GetEnableHelp(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetEnableHelp,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetEnableHelp(self, *_args, **_kwargs)

         return val
     def GetDefaultInfo(self, *_args, **_kwargs):
         return val
     def GetDefaultInfo(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetDefaultInfo,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetDefaultInfo(self, *_args, **_kwargs)

         return val
     def GetMarginTopLeft(self, *_args, **_kwargs):
         return val
     def GetMarginTopLeft(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetMarginTopLeft,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetMarginTopLeft(self, *_args, **_kwargs)

         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMarginBottomRight(self, *_args, **_kwargs):
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMarginBottomRight(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetMarginBottomRight,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetMarginBottomRight(self, *_args, **_kwargs)

         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMinMarginTopLeft(self, *_args, **_kwargs):
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMinMarginTopLeft(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetMinMarginTopLeft,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetMinMarginTopLeft(self, *_args, **_kwargs)

         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMinMarginBottomRight(self, *_args, **_kwargs):
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetMinMarginBottomRight(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetMinMarginBottomRight,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetMinMarginBottomRight(self, *_args, **_kwargs)

         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetPaperId(self, *_args, **_kwargs):
         if val: val = wxPointPtr(val) ; val.thisown = 1
         return val
     def GetPaperId(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetPaperId,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetPaperId(self, *_args, **_kwargs)

         return val
     def GetPaperSize(self, *_args, **_kwargs):
         return val
     def GetPaperSize(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetPaperSize,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetPaperSize(self, *_args, **_kwargs)

         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def GetPrintData(self, *_args, **_kwargs):
         if val: val = wxSizePtr(val) ; val.thisown = 1
         return val
     def GetPrintData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_GetPrintData,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_GetPrintData(self, *_args, **_kwargs)

         if val: val = wxPrintDataPtr(val) ; val.thisown = 1
         return val
         if val: val = wxPrintDataPtr(val) ; val.thisown = 1
         return val

+    def Ok(self, *_args, **_kwargs):
+        val = printfwc.wxPageSetupDialogData_Ok(self, *_args, **_kwargs)
+        return val

     def SetDefaultInfo(self, *_args, **_kwargs):
     def SetDefaultInfo(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetDefaultInfo,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetDefaultInfo(self, *_args, **_kwargs)

         return val
     def SetDefaultMinMargins(self, *_args, **_kwargs):
         return val
     def SetDefaultMinMargins(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetDefaultMinMargins,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetDefaultMinMargins(self, *_args, **_kwargs)

         return val
     def SetMarginTopLeft(self, *_args, **_kwargs):
         return val
     def SetMarginTopLeft(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetMarginTopLeft,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetMarginTopLeft(self, *_args, **_kwargs)

         return val
     def SetMarginBottomRight(self, *_args, **_kwargs):
         return val
     def SetMarginBottomRight(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetMarginBottomRight,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetMarginBottomRight(self, *_args, **_kwargs)

         return val
     def SetMinMarginTopLeft(self, *_args, **_kwargs):
         return val
     def SetMinMarginTopLeft(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetMinMarginTopLeft,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetMinMarginTopLeft(self, *_args, **_kwargs)

         return val
     def SetMinMarginBottomRight(self, *_args, **_kwargs):
         return val
     def SetMinMarginBottomRight(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetMinMarginBottomRight,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetMinMarginBottomRight(self, *_args, **_kwargs)

         return val
     def SetPaperId(self, *_args, **_kwargs):
         return val
     def SetPaperId(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetPaperId,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetPaperId(self, *_args, **_kwargs)

         return val
     def SetPaperSize(self, *_args, **_kwargs):
         return val
     def SetPaperSize(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetPaperSize,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetPaperSize(self, *_args, **_kwargs)

         return val
     def SetPrintData(self, *_args, **_kwargs):
         return val
     def SetPrintData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialogData_SetPrintData,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialogData_SetPrintData(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPageSetupDialogData instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+    def __nonzero__(self): return self.Ok()

 class wxPageSetupDialogData(wxPageSetupDialogDataPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPageSetupDialogData(wxPageSetupDialogDataPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPageSetupDialogData,_args,_kwargs)
+        self.this = printfwc.new_wxPageSetupDialogData(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -269,17 +306,17 @@ class wxPageSetupDialogPtr(wxDialogPtr):
         self.this = this
         self.thisown = 0
     def GetPageSetupData(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def GetPageSetupData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialog_GetPageSetupData,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialog_GetPageSetupData(self, *_args, **_kwargs)

         if val: val = wxPageSetupDialogDataPtr(val) 
         return val
     def ShowModal(self, *_args, **_kwargs):
         if val: val = wxPageSetupDialogDataPtr(val) 
         return val
     def ShowModal(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPageSetupDialog_ShowModal,(self,) + _args, _kwargs)
+        val = printfwc.wxPageSetupDialog_ShowModal(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPageSetupDialog instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPageSetupDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPageSetupDialog(wxPageSetupDialogPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPageSetupDialog(wxPageSetupDialogPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPageSetupDialog,_args,_kwargs)
+        self.this = printfwc.new_wxPageSetupDialog(*_args,**_kwargs)

         self.thisown = 1
         #wx._StdDialogCallbacks(self)
 
         self.thisown = 1
         #wx._StdDialogCallbacks(self)
 


@@ -290,81 +327,112 @@ class wxPrintDialogDataPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,printfwc=printfwc):
-        if self.thisown == 1 :
-            printfwc.delete_wxPrintDialogData(self)
-    def EnableHelp(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_EnableHelp,(self,) + _args, _kwargs)
+    def __del__(self, delfunc=printfwc.delete_wxPrintDialogData):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def GetFromPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetFromPage(self, *_args, **_kwargs)

         return val
         return val

-    def EnablePageNumbers(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_EnablePageNumbers,(self,) + _args, _kwargs)
+    def GetToPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetToPage(self, *_args, **_kwargs)

         return val
         return val

-    def EnablePrintToFile(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_EnablePrintToFile,(self,) + _args, _kwargs)
+    def GetMinPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetMinPage(self, *_args, **_kwargs)

         return val
         return val

-    def EnableSelection(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_EnableSelection,(self,) + _args, _kwargs)
+    def GetMaxPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetMaxPage(self, *_args, **_kwargs)
+        return val
+    def GetNoCopies(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetNoCopies(self, *_args, **_kwargs)

         return val
     def GetAllPages(self, *_args, **_kwargs):
         return val
     def GetAllPages(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialogData_GetAllPages,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialogData_GetAllPages(self, *_args, **_kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetSelection(self, *_args, **_kwargs)

         return val
     def GetCollate(self, *_args, **_kwargs):
         return val
     def GetCollate(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialogData_GetCollate,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialogData_GetCollate(self, *_args, **_kwargs)

         return val
         return val

-    def GetFromPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetFromPage,(self,) + _args, _kwargs)
+    def GetPrintToFile(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetPrintToFile(self, *_args, **_kwargs)

         return val
         return val

-    def GetMaxPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetMaxPage,(self,) + _args, _kwargs)
+    def GetSetupDialog(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetSetupDialog(self, *_args, **_kwargs)

         return val
         return val

-    def GetMinPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetMinPage,(self,) + _args, _kwargs)
+    def SetFromPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetFromPage(self, *_args, **_kwargs)

         return val
         return val

-    def GetNoCopies(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetNoCopies,(self,) + _args, _kwargs)
+    def SetToPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetToPage(self, *_args, **_kwargs)

         return val
         return val

-    def GetPrintData(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetPrintData,(self,) + _args, _kwargs)
-        if val: val = wxPrintDataPtr(val) ; val.thisown = 1
+    def SetMinPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetMinPage(self, *_args, **_kwargs)

         return val
         return val

-    def GetPrintToFile(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetPrintToFile,(self,) + _args, _kwargs)
+    def SetMaxPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetMaxPage(self, *_args, **_kwargs)

         return val
         return val

-    def GetToPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_GetToPage,(self,) + _args, _kwargs)
+    def SetNoCopies(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetNoCopies(self, *_args, **_kwargs)
+        return val
+    def SetAllPages(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetAllPages(self, *_args, **_kwargs)
+        return val
+    def SetSelection(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetSelection(self, *_args, **_kwargs)

         return val
     def SetCollate(self, *_args, **_kwargs):
         return val
     def SetCollate(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialogData_SetCollate,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialogData_SetCollate(self, *_args, **_kwargs)

         return val
         return val

-    def SetFromPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetFromPage,(self,) + _args, _kwargs)
+    def SetPrintToFile(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetPrintToFile(self, *_args, **_kwargs)

         return val
         return val

-    def SetMaxPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetMaxPage,(self,) + _args, _kwargs)
+    def SetSetupDialog(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetSetupDialog(self, *_args, **_kwargs)

         return val
         return val

-    def SetMinPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetMinPage,(self,) + _args, _kwargs)
+    def EnablePrintToFile(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_EnablePrintToFile(self, *_args, **_kwargs)

         return val
         return val

-    def SetNoCopies(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetNoCopies,(self,) + _args, _kwargs)
+    def EnableSelection(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_EnableSelection(self, *_args, **_kwargs)

         return val
         return val

-    def SetPrintData(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetPrintData,(self,) + _args, _kwargs)
+    def EnablePageNumbers(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_EnablePageNumbers(self, *_args, **_kwargs)

         return val
         return val

-    def SetPrintToFile(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetPrintToFile,(self,) + _args, _kwargs)
+    def EnableHelp(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_EnableHelp(self, *_args, **_kwargs)

         return val
         return val

-    def SetSetupDialog(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetSetupDialog,(self,) + _args, _kwargs)
+    def GetEnablePrintToFile(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetEnablePrintToFile(self, *_args, **_kwargs)

         return val
         return val

-    def SetToPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintDialogData_SetToPage,(self,) + _args, _kwargs)
+    def GetEnableSelection(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetEnableSelection(self, *_args, **_kwargs)
+        return val
+    def GetEnablePageNumbers(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetEnablePageNumbers(self, *_args, **_kwargs)
+        return val
+    def GetEnableHelp(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetEnableHelp(self, *_args, **_kwargs)
+        return val
+    def Ok(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_Ok(self, *_args, **_kwargs)
+        return val
+    def GetPrintData(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_GetPrintData(self, *_args, **_kwargs)
+        if val: val = wxPrintDataPtr(val) ; val.thisown = 1
+        return val
+    def SetPrintData(self, *_args, **_kwargs):
+        val = printfwc.wxPrintDialogData_SetPrintData(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintDialogData instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+    def __nonzero__(self): return self.Ok()

 class wxPrintDialogData(wxPrintDialogDataPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrintDialogData(wxPrintDialogDataPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrintDialogData,_args,_kwargs)
+        self.this = printfwc.new_wxPrintDialogData(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -375,22 +443,21 @@ class wxPrintDialogPtr(wxDialogPtr):
         self.this = this
         self.thisown = 0
     def GetPrintDialogData(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def GetPrintDialogData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialog_GetPrintDialogData,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialog_GetPrintDialogData(self, *_args, **_kwargs)

         if val: val = wxPrintDialogDataPtr(val) 
         return val
     def GetPrintDC(self, *_args, **_kwargs):
         if val: val = wxPrintDialogDataPtr(val) 
         return val
     def GetPrintDC(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialog_GetPrintDC,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialog_GetPrintDC(self, *_args, **_kwargs)

         return val
     def ShowModal(self, *_args, **_kwargs):
         return val
     def ShowModal(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintDialog_ShowModal,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintDialog_ShowModal(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintDialog instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrintDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPrintDialog(wxPrintDialogPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrintDialog(wxPrintDialogPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrintDialog,_args,_kwargs)
+        self.this = printfwc.new_wxPrintDialog(*_args,**_kwargs)

         self.thisown = 1
         self.thisown = 1

-        #wx._StdDialogCallbacks(self)

 
 
 
 
 
 


@@ -400,55 +467,55 @@ class wxPrintoutPtr(wxObjectPtr):
         self.this = this
         self.thisown = 0
     def _setCallbackInfo(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def _setCallbackInfo(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout__setCallbackInfo,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout__setCallbackInfo(self, *_args, **_kwargs)

         return val
     def Destroy(self, *_args, **_kwargs):
         return val
     def Destroy(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_Destroy,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_Destroy(self, *_args, **_kwargs)

         return val
     def GetDC(self, *_args, **_kwargs):
         return val
     def GetDC(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_GetDC(self, *_args, **_kwargs)

         return val
     def GetPageSizeMM(self, *_args, **_kwargs):
         return val
     def GetPageSizeMM(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_GetPageSizeMM,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_GetPageSizeMM(self, *_args, **_kwargs)

         return val
     def GetPageSizePixels(self, *_args, **_kwargs):
         return val
     def GetPageSizePixels(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_GetPageSizePixels,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_GetPageSizePixels(self, *_args, **_kwargs)

         return val
     def GetPPIPrinter(self, *_args, **_kwargs):
         return val
     def GetPPIPrinter(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_GetPPIPrinter,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_GetPPIPrinter(self, *_args, **_kwargs)

         return val
     def GetPPIScreen(self, *_args, **_kwargs):
         return val
     def GetPPIScreen(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_GetPPIScreen,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_GetPPIScreen(self, *_args, **_kwargs)

         return val
     def IsPreview(self, *_args, **_kwargs):
         return val
     def IsPreview(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_IsPreview,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_IsPreview(self, *_args, **_kwargs)

         return val
     def base_OnBeginDocument(self, *_args, **_kwargs):
         return val
     def base_OnBeginDocument(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_OnBeginDocument,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_OnBeginDocument(self, *_args, **_kwargs)

         return val
     def base_OnEndDocument(self, *_args, **_kwargs):
         return val
     def base_OnEndDocument(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_OnEndDocument,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_OnEndDocument(self, *_args, **_kwargs)

         return val
     def base_OnBeginPrinting(self, *_args, **_kwargs):
         return val
     def base_OnBeginPrinting(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_OnBeginPrinting,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_OnBeginPrinting(self, *_args, **_kwargs)

         return val
     def base_OnEndPrinting(self, *_args, **_kwargs):
         return val
     def base_OnEndPrinting(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_OnEndPrinting,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_OnEndPrinting(self, *_args, **_kwargs)

         return val
     def base_OnPreparePrinting(self, *_args, **_kwargs):
         return val
     def base_OnPreparePrinting(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_OnPreparePrinting,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_OnPreparePrinting(self, *_args, **_kwargs)

         return val
     def base_GetPageInfo(self, *_args, **_kwargs):
         return val
     def base_GetPageInfo(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_GetPageInfo,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_GetPageInfo(self, *_args, **_kwargs)

         return val
     def base_HasPage(self, *_args, **_kwargs):
         return val
     def base_HasPage(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintout_base_HasPage,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintout_base_HasPage(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintout instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPrintout(wxPrintoutPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrintout(wxPrintoutPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrintout,_args,_kwargs)
+        self.this = printfwc.new_wxPrintout(*_args,**_kwargs)

         self.thisown = 1
         self._setCallbackInfo(self, wxPrintout)
 
         self.thisown = 1
         self._setCallbackInfo(self, wxPrintout)
 


@@ -459,33 +526,53 @@ class wxPrinterPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     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):
     def CreateAbortWindow(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_CreateAbortWindow,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_CreateAbortWindow(self, *_args, **_kwargs)

         return val
     def GetPrintDialogData(self, *_args, **_kwargs):
         return val
     def GetPrintDialogData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_GetPrintDialogData,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_GetPrintDialogData(self, *_args, **_kwargs)

         if val: val = wxPrintDialogDataPtr(val) 
         return val
     def Print(self, *_args, **_kwargs):
         if val: val = wxPrintDialogDataPtr(val) 
         return val
     def Print(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_Print,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_Print(self, *_args, **_kwargs)

         return val
     def PrintDialog(self, *_args, **_kwargs):
         return val
     def PrintDialog(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_PrintDialog,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_PrintDialog(self, *_args, **_kwargs)

         return val
     def ReportError(self, *_args, **_kwargs):
         return val
     def ReportError(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_ReportError,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_ReportError(self, *_args, **_kwargs)

         return val
     def Setup(self, *_args, **_kwargs):
         return val
     def Setup(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrinter_Setup,(self,) + _args, _kwargs)
+        val = printfwc.wxPrinter_Setup(self, *_args, **_kwargs)
+        return val
+    def GetAbort(self, *_args, **_kwargs):
+        val = printfwc.wxPrinter_GetAbort(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrinter instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrinter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPrinter(wxPrinterPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrinter(wxPrinterPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrinter,_args,_kwargs)
+        self.this = printfwc.new_wxPrinter(*_args,**_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxPrintAbortDialogPtr(wxDialogPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPrintAbortDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPrintAbortDialog(wxPrintAbortDialogPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPrintAbortDialog(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -495,60 +582,80 @@ class wxPrintPreviewPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def GetCanvas(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_GetCanvas,(self,) + _args, _kwargs)
+    def SetCurrentPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetCurrentPage(self, *_args, **_kwargs)

         return val
     def GetCurrentPage(self, *_args, **_kwargs):
         return val
     def GetCurrentPage(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintPreview_GetCurrentPage,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintPreview_GetCurrentPage(self, *_args, **_kwargs)
+        return val
+    def SetPrintout(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetPrintout(self, *_args, **_kwargs)
+        return val
+    def GetPrintout(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_GetPrintout(self, *_args, **_kwargs)
+        return val
+    def GetPrintoutForPrinting(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_GetPrintoutForPrinting(self, *_args, **_kwargs)
+        return val
+    def SetFrame(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetFrame(self, *_args, **_kwargs)
+        return val
+    def SetCanvas(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetCanvas(self, *_args, **_kwargs)

         return val
     def GetFrame(self, *_args, **_kwargs):
         return val
     def GetFrame(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintPreview_GetFrame,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintPreview_GetFrame(self, *_args, **_kwargs)

         return val
         return val

-    def GetMaxPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_GetMaxPage,(self,) + _args, _kwargs)
+    def GetCanvas(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_GetCanvas(self, *_args, **_kwargs)
+        if val: val = wxPreviewCanvasPtr(val) 

         return val
         return val

-    def GetMinPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_GetMinPage,(self,) + _args, _kwargs)
+    def PaintPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_PaintPage(self, *_args, **_kwargs)
+        return val
+    def DrawBlankPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_DrawBlankPage(self, *_args, **_kwargs)
+        return val
+    def RenderPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_RenderPage(self, *_args, **_kwargs)
+        return val
+    def AdjustScrollbars(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_AdjustScrollbars(self, *_args, **_kwargs)

         return val
     def GetPrintDialogData(self, *_args, **_kwargs):
         return val
     def GetPrintDialogData(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPrintPreview_GetPrintDialogData,(self,) + _args, _kwargs)
+        val = printfwc.wxPrintPreview_GetPrintDialogData(self, *_args, **_kwargs)

         if val: val = wxPrintDialogDataPtr(val) 
         return val
         if val: val = wxPrintDialogDataPtr(val) 
         return val

-    def GetPrintout(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_GetPrintout,(self,) + _args, _kwargs)
-        return val
-    def GetPrintoutForPrinting(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_GetPrintoutForPrinting,(self,) + _args, _kwargs)
+    def SetZoom(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetZoom(self, *_args, **_kwargs)

         return val
     def GetZoom(self, *_args, **_kwargs):
         return val
     def GetZoom(self, *_args, **_kwargs):

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

         return val
         return val

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

         return val
         return val

-    def SetCanvas(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_SetCanvas,(self,) + _args, _kwargs)
+    def GetMinPage(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_GetMinPage(self, *_args, **_kwargs)

         return val
         return val

-    def SetCurrentPage(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_SetCurrentPage,(self,) + _args, _kwargs)
+    def Ok(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_Ok(self, *_args, **_kwargs)

         return val
         return val

-    def SetFrame(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_SetFrame,(self,) + _args, _kwargs)
+    def SetOk(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_SetOk(self, *_args, **_kwargs)

         return val
         return val

-    def SetPrintout(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_SetPrintout,(self,) + _args, _kwargs)
+    def Print(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_Print(self, *_args, **_kwargs)

         return val
         return val

-    def SetZoom(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintPreview_SetZoom,(self,) + _args, _kwargs)
+    def DetermineScaling(self, *_args, **_kwargs):
+        val = printfwc.wxPrintPreview_DetermineScaling(self, *_args, **_kwargs)

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPrintPreview instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+    def __nonzero__(self): return self.Ok()

 class wxPrintPreview(wxPrintPreviewPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPrintPreview(wxPrintPreviewPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPrintPreview,_args,_kwargs)
+        self.this = printfwc.new_wxPrintPreview(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -559,14 +666,180 @@ class wxPreviewFramePtr(wxFramePtr):
         self.this = this
         self.thisown = 0
     def Initialize(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Initialize(self, *_args, **_kwargs):

-        val = apply(printfwc.wxPreviewFrame_Initialize,(self,) + _args, _kwargs)
+        val = printfwc.wxPreviewFrame_Initialize(self, *_args, **_kwargs)
+        return val
+    def CreateControlBar(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewFrame_CreateControlBar(self, *_args, **_kwargs)
+        return val
+    def CreateCanvas(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewFrame_CreateCanvas(self, *_args, **_kwargs)
+        return val
+    def GetControlBar(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewFrame_GetControlBar(self, *_args, **_kwargs)
+        if val: val = wxPreviewControlBarPtr(val) 

         return val
     def __repr__(self):
         return val
     def __repr__(self):

-        return "<C wxPreviewFrame instance at %s>" % (self.this,)
+        return "<%s.%s instance; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)

 class wxPreviewFrame(wxPreviewFramePtr):
     def __init__(self,*_args,**_kwargs):
 class wxPreviewFrame(wxPreviewFramePtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(printfwc.new_wxPreviewFrame,_args,_kwargs)
+        self.this = printfwc.new_wxPreviewFrame(*_args,**_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
+class wxPreviewCanvasPtr(wxScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPreviewCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPreviewCanvas(wxPreviewCanvasPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPreviewCanvas(*_args,**_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
+class wxPreviewControlBarPtr(wxPanelPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetZoomControl(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_GetZoomControl(self, *_args, **_kwargs)
+        return val
+    def SetZoomControl(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_SetZoomControl(self, *_args, **_kwargs)
+        return val
+    def GetPrintPreview(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_GetPrintPreview(self, *_args, **_kwargs)
+        if val: val = wxPrintPreviewPtr(val) 
+        return val
+    def OnNext(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_OnNext(self, *_args, **_kwargs)
+        return val
+    def OnPrevious(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_OnPrevious(self, *_args, **_kwargs)
+        return val
+    def OnFirst(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_OnFirst(self, *_args, **_kwargs)
+        return val
+    def OnLast(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_OnLast(self, *_args, **_kwargs)
+        return val
+    def OnGoto(self, *_args, **_kwargs):
+        val = printfwc.wxPreviewControlBar_OnGoto(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPreviewControlBar(wxPreviewControlBarPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPreviewControlBar(*_args,**_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
+class wxPyPrintPreviewPtr(wxPrintPreviewPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def base_SetCurrentPage(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_SetCurrentPage(self, *_args, **_kwargs)
+        return val
+    def base_PaintPage(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_PaintPage(self, *_args, **_kwargs)
+        return val
+    def base_DrawBlankPage(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_DrawBlankPage(self, *_args, **_kwargs)
+        return val
+    def base_RenderPage(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_RenderPage(self, *_args, **_kwargs)
+        return val
+    def base_SetZoom(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_SetZoom(self, *_args, **_kwargs)
+        return val
+    def base_Print(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_Print(self, *_args, **_kwargs)
+        return val
+    def base_DetermineScaling(self, *_args, **_kwargs):
+        val = printfwc.wxPyPrintPreview_base_DetermineScaling(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPyPrintPreview(wxPyPrintPreviewPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPyPrintPreview(*_args,**_kwargs)

         self.thisown = 1
         self.thisown = 1

+        self._setCallbackInfo(self, wxPyPrintPreview)
+
+
+
+
+class wxPyPreviewFramePtr(wxPreviewFramePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def SetPreviewCanvas(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame_SetPreviewCanvas(self, *_args, **_kwargs)
+        return val
+    def SetControlBar(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame_SetControlBar(self, *_args, **_kwargs)
+        return val
+    def base_Initialize(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame_base_Initialize(self, *_args, **_kwargs)
+        return val
+    def base_CreateCanvas(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame_base_CreateCanvas(self, *_args, **_kwargs)
+        return val
+    def base_CreateControlBar(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewFrame_base_CreateControlBar(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPyPreviewFrame(wxPyPreviewFramePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPyPreviewFrame(*_args,**_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxPyPreviewFrame)
+        self._setOORInfo(self)
+
+
+
+
+class wxPyPreviewControlBarPtr(wxPreviewControlBarPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewControlBar__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def SetPrintPreview(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewControlBar_SetPrintPreview(self, *_args, **_kwargs)
+        return val
+    def base_CreateButtons(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewControlBar_base_CreateButtons(self, *_args, **_kwargs)
+        return val
+    def base_SetZoomControl(self, *_args, **_kwargs):
+        val = printfwc.wxPyPreviewControlBar_base_SetZoomControl(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxPyPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxPyPreviewControlBar(wxPyPreviewControlBarPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = printfwc.new_wxPyPreviewControlBar(*_args,**_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxPyPreviewControlBar)

         self._setOORInfo(self)
 
 
         self._setOORInfo(self)
 
 


@@ -576,7 +849,36 @@ class wxPreviewFrame(wxPreviewFramePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

+wxPostScriptDC_SetResolution = printfwc.wxPostScriptDC_SetResolution
+
+wxPostScriptDC_GetResolution = printfwc.wxPostScriptDC_GetResolution
+
+wxPrinter_GetLastError = printfwc.wxPrinter_GetLastError
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+wxPRINT_MODE_NONE = printfwc.wxPRINT_MODE_NONE
+wxPRINT_MODE_PREVIEW = printfwc.wxPRINT_MODE_PREVIEW
+wxPRINT_MODE_FILE = printfwc.wxPRINT_MODE_FILE
+wxPRINT_MODE_PRINTER = printfwc.wxPRINT_MODE_PRINTER
+wxPRINTER_NO_ERROR = printfwc.wxPRINTER_NO_ERROR
+wxPRINTER_CANCELLED = printfwc.wxPRINTER_CANCELLED
+wxPRINTER_ERROR = printfwc.wxPRINTER_ERROR
+wxPREVIEW_PRINT = printfwc.wxPREVIEW_PRINT
+wxPREVIEW_PREVIOUS = printfwc.wxPREVIEW_PREVIOUS
+wxPREVIEW_NEXT = printfwc.wxPREVIEW_NEXT
+wxPREVIEW_ZOOM = printfwc.wxPREVIEW_ZOOM
+wxPREVIEW_FIRST = printfwc.wxPREVIEW_FIRST
+wxPREVIEW_LAST = printfwc.wxPREVIEW_LAST
+wxPREVIEW_GOTO = printfwc.wxPREVIEW_GOTO
+wxPREVIEW_DEFAULT = printfwc.wxPREVIEW_DEFAULT
+wxID_PREVIEW_CLOSE = printfwc.wxID_PREVIEW_CLOSE
+wxID_PREVIEW_NEXT = printfwc.wxID_PREVIEW_NEXT
+wxID_PREVIEW_PREVIOUS = printfwc.wxID_PREVIEW_PREVIOUS
+wxID_PREVIEW_PRINT = printfwc.wxID_PREVIEW_PRINT
+wxID_PREVIEW_ZOOM = printfwc.wxID_PREVIEW_ZOOM
+wxID_PREVIEW_FIRST = printfwc.wxID_PREVIEW_FIRST
+wxID_PREVIEW_LAST = printfwc.wxID_PREVIEW_LAST
+wxID_PREVIEW_GOTO = printfwc.wxID_PREVIEW_GOTO