fixed bug in generation of thumb scroll events

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

diff --git a/wxPython/src/msw/printfw.py b/wxPython/src/msw/printfw.py
index ec84101cd82c5d0ac9b23c3bad37ed24087755d4..7a77c24f2bd20d00168cfb89c4c466e2f297d66c 100644 (file)
--- a/wxPython/src/msw/printfw.py
+++ b/wxPython/src/msw/printfw.py
@@ -7,19 +7,21 @@ 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 *
 

+from events import *
+

 from frames import *
 
 from stattool import *
 
 from controls import *
 from frames import *
 
 from stattool import *
 
 from controls import *

-
-from events import *

 import wx
 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 +178,33 @@ def wxPrinterDC2(*_args,**_kwargs):
     return val
 
 
     return val
 
 

-class wxPageSetupDialogDataPtr :
+class wxPostScriptDCPtr(wxDCPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPostScriptDC_GetPrintData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDataPtr(val) 
+        return val
+    def SetPrintData(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPostScriptDC_SetPrintData,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPostScriptDC instance at %s>" % (self.this,)
+class wxPostScriptDC(wxPostScriptDCPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(printfwc.new_wxPostScriptDC,_args,_kwargs)
+        self.thisown = 1
+
+
+
+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 __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -305,7 +333,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 +427,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,19 +442,18 @@ 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

-    def _setSelf(self, *_args, **_kwargs):
-        val = apply(printfwc.wxPrintout__setSelf,(self,) + _args, _kwargs)
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(printfwc.wxPrintout__setCallbackInfo,(self,) + _args, _kwargs)

         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_Destroy,(self,) + _args, _kwargs)
         return val
     def GetDC(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_GetDC,(self,) + _args, _kwargs)
         return val
     def Destroy(self, *_args, **_kwargs):
         val = apply(printfwc.wxPrintout_Destroy,(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)


@@ -471,12 +497,12 @@ class wxPrintout(wxPrintoutPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(printfwc.new_wxPrintout,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(printfwc.new_wxPrintout,_args,_kwargs)
         self.thisown = 1

-        self._setSelf(self, wxPrintout)
+        self._setCallbackInfo(self, wxPrintout)

 
 
 
 
 
 
 
 

-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 +521,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 +538,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 +563,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)


@@ -593,7 +614,7 @@ class wxPreviewFrame(wxPreviewFramePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(printfwc.new_wxPreviewFrame,_args,_kwargs)
         self.thisown = 1
     def __init__(self,*_args,**_kwargs):
         self.this = apply(printfwc.new_wxPreviewFrame,_args,_kwargs)
         self.thisown = 1

-        #wx._StdFrameCallbacks(self)
+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -602,6 +623,10 @@ class wxPreviewFrame(wxPreviewFramePtr):
 
 #-------------- FUNCTION WRAPPERS ------------------
 
 
 #-------------- FUNCTION WRAPPERS ------------------
 

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

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