reSWIGged

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

diff --git a/wxPython/src/msw/windows3.py b/wxPython/src/msw/windows3.py
index 9674a3cb2ef9dd0672d76a39166fe68e5ab83878..c99bcfda6a594761e04bdf36e525ee4cc99b4355 100644 (file)
--- a/wxPython/src/msw/windows3.py
+++ b/wxPython/src/msw/windows3.py
@@ -5,6 +5,8 @@ from misc import *
 
 from gdi import *
 
 
 from gdi import *
 

+from fonts import *
+

 from windows import *
 
 from clip_dnd import *
 from windows import *
 
 from clip_dnd import *


@@ -26,29 +28,29 @@ class wxSashEventPtr(wxCommandEventPtr):
         self.this = this
         self.thisown = 0
     def SetEdge(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def SetEdge(self, *_args, **_kwargs):

-        val = apply(windows3c.wxSashEvent_SetEdge,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetEdge(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashEvent_GetEdge,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetEdge(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashEvent_SetDragRect,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetDragRect(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashEvent_GetDragRect,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetDragRect(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashEvent_SetDragStatus,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_SetDragStatus(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashEvent_GetDragStatus,(self,) + _args, _kwargs)
+        val = windows3c.wxSashEvent_GetDragStatus(self, *_args, **_kwargs)

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

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

 class wxSashEvent(wxSashEventPtr):
     def __init__(self,*_args,**_kwargs):
 class wxSashEvent(wxSashEventPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxSashEvent,_args,_kwargs)
+        self.this = windows3c.new_wxSashEvent(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -59,73 +61,73 @@ class wxSashWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(windows3c.wxSashWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_Create(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetSashVisible,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetSashVisible(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetDefaultBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetDefaultBorderSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetEdgeMargin,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetEdgeMargin(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetExtraBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetExtraBorderSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetMaximumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMaximumSizeX(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetMaximumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMaximumSizeY(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetMinimumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMinimumSizeX(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_GetMinimumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_GetMinimumSizeY(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_HasBorder,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_HasBorder(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetDefaultBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetDefaultBorderSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetExtraBorderSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetExtraBorderSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetMaximumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMaximumSizeX(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetMaximumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMaximumSizeY(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetMinimumSizeX,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMinimumSizeX(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetMinimumSizeY,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetMinimumSizeY(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetSashVisible,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetSashVisible(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashWindow_SetSashBorder,(self,) + _args, _kwargs)
+        val = windows3c.wxSashWindow_SetSashBorder(self, *_args, **_kwargs)

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

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

 class wxSashWindow(wxSashWindowPtr):
     def __init__(self,*_args,**_kwargs):
 class wxSashWindow(wxSashWindowPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxSashWindow,_args,_kwargs)
+        self.this = windows3c.new_wxSashWindow(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashWindow(*_args,**_kwargs):
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashWindow(*_args,**_kwargs):

-    val = wxSashWindowPtr(apply(windows3c.new_wxPreSashWindow,_args,_kwargs))
+    val = wxSashWindowPtr(windows3c.new_wxPreSashWindow(*_args,**_kwargs))

     val.thisown = 1
     val.thisown = 1

-    val._setOORInfo(self)
+    val._setOORInfo(val)

     return val
 
 
     return val
 
 


@@ -134,41 +136,41 @@ class wxQueryLayoutInfoEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def SetRequestedLength(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def SetRequestedLength(self, *_args, **_kwargs):

-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetRequestedLength,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetRequestedLength(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetRequestedLength,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetRequestedLength(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetFlags(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetFlags(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetSize,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetSize,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetOrientation(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetOrientation(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_SetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_SetAlignment(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxQueryLayoutInfoEvent_GetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxQueryLayoutInfoEvent_GetAlignment(self, *_args, **_kwargs)

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

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

 class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
     def __init__(self,*_args,**_kwargs):
 class wxQueryLayoutInfoEvent(wxQueryLayoutInfoEventPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxQueryLayoutInfoEvent,_args,_kwargs)
+        self.this = windows3c.new_wxQueryLayoutInfoEvent(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -179,23 +181,23 @@ class wxCalculateLayoutEventPtr(wxEventPtr):
         self.this = this
         self.thisown = 0
     def SetFlags(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def SetFlags(self, *_args, **_kwargs):

-        val = apply(windows3c.wxCalculateLayoutEvent_SetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_SetFlags(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxCalculateLayoutEvent_GetFlags,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_GetFlags(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxCalculateLayoutEvent_SetRect,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_SetRect(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxCalculateLayoutEvent_GetRect,(self,) + _args, _kwargs)
+        val = windows3c.wxCalculateLayoutEvent_GetRect(self, *_args, **_kwargs)

         if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
     def __repr__(self):
         if val: val = wxRectPtr(val) ; val.thisown = 1
         return val
     def __repr__(self):

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

 class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
     def __init__(self,*_args,**_kwargs):
 class wxCalculateLayoutEvent(wxCalculateLayoutEventPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxCalculateLayoutEvent,_args,_kwargs)
+        self.this = windows3c.new_wxCalculateLayoutEvent(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -206,37 +208,37 @@ class wxSashLayoutWindowPtr(wxSashWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(windows3c.wxSashLayoutWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_Create(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashLayoutWindow_GetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_GetAlignment(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashLayoutWindow_GetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_GetOrientation(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashLayoutWindow_SetAlignment,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetAlignment(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashLayoutWindow_SetDefaultSize,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetDefaultSize(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxSashLayoutWindow_SetOrientation,(self,) + _args, _kwargs)
+        val = windows3c.wxSashLayoutWindow_SetOrientation(self, *_args, **_kwargs)

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

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

 class wxSashLayoutWindow(wxSashLayoutWindowPtr):
     def __init__(self,*_args,**_kwargs):
 class wxSashLayoutWindow(wxSashLayoutWindowPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxSashLayoutWindow,_args,_kwargs)
+        self.this = windows3c.new_wxSashLayoutWindow(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashLayoutWindow(*_args,**_kwargs):
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPreSashLayoutWindow(*_args,**_kwargs):

-    val = wxSashLayoutWindowPtr(apply(windows3c.new_wxPreSashLayoutWindow,_args,_kwargs))
+    val = wxSashLayoutWindowPtr(windows3c.new_wxPreSashLayoutWindow(*_args,**_kwargs))

     val.thisown = 1
     val.thisown = 1

-    val._setOORInfo(self)
+    val._setOORInfo(val)

     return val
 
 
     return val
 
 


@@ -244,23 +246,26 @@ class wxLayoutAlgorithmPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,windows3c=windows3c):
-        if self.thisown == 1 :
-            windows3c.delete_wxLayoutAlgorithm(self)
+    def __del__(self, delfunc=windows3c.delete_wxLayoutAlgorithm):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

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

-        val = apply(windows3c.wxLayoutAlgorithm_LayoutMDIFrame,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutMDIFrame(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxLayoutAlgorithm_LayoutFrame,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutFrame(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxLayoutAlgorithm_LayoutWindow,(self,) + _args, _kwargs)
+        val = windows3c.wxLayoutAlgorithm_LayoutWindow(self, *_args, **_kwargs)

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

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

 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):
     def __init__(self,*_args,**_kwargs):
 class wxLayoutAlgorithm(wxLayoutAlgorithmPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxLayoutAlgorithm,_args,_kwargs)
+        self.this = windows3c.new_wxLayoutAlgorithm(*_args,**_kwargs)

         self.thisown = 1
 
 
         self.thisown = 1
 
 


@@ -271,25 +276,25 @@ class wxPopupWindowPtr(wxWindowPtr):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def Create(self, *_args, **_kwargs):

-        val = apply(windows3c.wxPopupWindow_Create,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupWindow_Create(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxPopupWindow_Position,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupWindow_Position(self, *_args, **_kwargs)

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

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

 class wxPopupWindow(wxPopupWindowPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPopupWindow(wxPopupWindowPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxPopupWindow,_args,_kwargs)
+        self.this = windows3c.new_wxPopupWindow(*_args,**_kwargs)

         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPrePopupWindow(*_args,**_kwargs):
         self.thisown = 1
         self._setOORInfo(self)
 
 
 
 def wxPrePopupWindow(*_args,**_kwargs):

-    val = wxPopupWindowPtr(apply(windows3c.new_wxPrePopupWindow,_args,_kwargs))
+    val = wxPopupWindowPtr(windows3c.new_wxPrePopupWindow(*_args,**_kwargs))

     val.thisown = 1
     val.thisown = 1

-    val._setOORInfo(self)
+    val._setOORInfo(val)

     return val
 
 
     return val
 
 


@@ -298,19 +303,19 @@ class wxPopupTransientWindowPtr(wxPopupWindowPtr):
         self.this = this
         self.thisown = 0
     def _setCallbackInfo(self, *_args, **_kwargs):
         self.this = this
         self.thisown = 0
     def _setCallbackInfo(self, *_args, **_kwargs):

-        val = apply(windows3c.wxPopupTransientWindow__setCallbackInfo,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow__setCallbackInfo(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxPopupTransientWindow_Popup,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow_Popup(self, *_args, **_kwargs)

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

-        val = apply(windows3c.wxPopupTransientWindow_Dismiss,(self,) + _args, _kwargs)
+        val = windows3c.wxPopupTransientWindow_Dismiss(self, *_args, **_kwargs)

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

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

 class wxPopupTransientWindow(wxPopupTransientWindowPtr):
     def __init__(self,*_args,**_kwargs):
 class wxPopupTransientWindow(wxPopupTransientWindowPtr):
     def __init__(self,*_args,**_kwargs):

-        self.this = apply(windows3c.new_wxPopupTransientWindow,_args,_kwargs)
+        self.this = windows3c.new_wxPopupTransientWindow(*_args,**_kwargs)

         self.thisown = 1
         self._setCallbackInfo(self, wxPopupTransientWindow)
         self._setOORInfo(self)
         self.thisown = 1
         self._setCallbackInfo(self, wxPopupTransientWindow)
         self._setOORInfo(self)


@@ -318,9 +323,224 @@ class wxPopupTransientWindow(wxPopupTransientWindowPtr):
 
 
 def wxPrePopupTransientWindow(*_args,**_kwargs):
 
 
 def wxPrePopupTransientWindow(*_args,**_kwargs):

-    val = wxPopupTransientWindowPtr(apply(windows3c.new_wxPrePopupTransientWindow,_args,_kwargs))
+    val = wxPopupTransientWindowPtr(windows3c.new_wxPrePopupTransientWindow(*_args,**_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxTipWindowPtr(wxPopupTransientWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetBoundingRect(self, *_args, **_kwargs):
+        val = windows3c.wxTipWindow_SetBoundingRect(self, *_args, **_kwargs)
+        return val
+    def Close(self, *_args, **_kwargs):
+        val = windows3c.wxTipWindow_Close(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxTipWindow(wxTipWindowPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = windows3c.new_wxTipWindow(*_args,**_kwargs)
+        self.thisown = 1
+        self._setOORInfo(self)
+
+
+
+
+class wxVScrolledWindowPtr(wxPanelPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def Create(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_Create(self, *_args, **_kwargs)
+        return val
+    def SetLineCount(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_SetLineCount(self, *_args, **_kwargs)
+        return val
+    def ScrollToLine(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_ScrollToLine(self, *_args, **_kwargs)
+        return val
+    def ScrollLines(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_ScrollLines(self, *_args, **_kwargs)
+        return val
+    def ScrollPages(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_ScrollPages(self, *_args, **_kwargs)
+        return val
+    def RefreshLine(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_RefreshLine(self, *_args, **_kwargs)
+        return val
+    def RefreshLines(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_RefreshLines(self, *_args, **_kwargs)
+        return val
+    def HitTestXT(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_HitTestXT(self, *_args, **_kwargs)
+        return val
+    def HitTest(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_HitTest(self, *_args, **_kwargs)
+        return val
+    def RefreshAll(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_RefreshAll(self, *_args, **_kwargs)
+        return val
+    def GetLineCount(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_GetLineCount(self, *_args, **_kwargs)
+        return val
+    def GetFirstVisibleLine(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_GetFirstVisibleLine(self, *_args, **_kwargs)
+        return val
+    def GetLastVisibleLine(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_GetLastVisibleLine(self, *_args, **_kwargs)
+        return val
+    def IsVisible(self, *_args, **_kwargs):
+        val = windows3c.wxVScrolledWindow_IsVisible(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxVScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxVScrolledWindow(wxVScrolledWindowPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = windows3c.new_wxVScrolledWindow(*_args,**_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxVScrolledWindow)
+        self._setOORInfo(self)
+
+
+
+def wxPreVScrolledWindow(*_args,**_kwargs):
+    val = wxVScrolledWindowPtr(windows3c.new_wxPreVScrolledWindow(*_args,**_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxVListBoxPtr(wxVScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def Create(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_Create(self, *_args, **_kwargs)
+        return val
+    def GetItemCount(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetItemCount(self, *_args, **_kwargs)
+        return val
+    def HasMultipleSelection(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_HasMultipleSelection(self, *_args, **_kwargs)
+        return val
+    def GetSelection(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetSelection(self, *_args, **_kwargs)
+        return val
+    def IsCurrent(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_IsCurrent(self, *_args, **_kwargs)
+        return val
+    def IsSelected(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_IsSelected(self, *_args, **_kwargs)
+        return val
+    def GetSelectedCount(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetSelectedCount(self, *_args, **_kwargs)
+        return val
+    def GetFirstSelected(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetFirstSelected(self, *_args, **_kwargs)
+        return val
+    def GetNextSelected(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetNextSelected(self, *_args, **_kwargs)
+        return val
+    def GetMargins(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetMargins(self, *_args, **_kwargs)
+        if val: val = wxPointPtr(val) ; val.thisown = 1
+        return val
+    def GetSelectionBackground(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_GetSelectionBackground(self, *_args, **_kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def SetItemCount(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SetItemCount(self, *_args, **_kwargs)
+        return val
+    def Clear(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_Clear(self, *_args, **_kwargs)
+        return val
+    def SetSelection(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SetSelection(self, *_args, **_kwargs)
+        return val
+    def Select(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_Select(self, *_args, **_kwargs)
+        return val
+    def SelectRange(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SelectRange(self, *_args, **_kwargs)
+        return val
+    def Toggle(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_Toggle(self, *_args, **_kwargs)
+        return val
+    def SelectAll(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SelectAll(self, *_args, **_kwargs)
+        return val
+    def DeselectAll(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_DeselectAll(self, *_args, **_kwargs)
+        return val
+    def SetMargins(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SetMargins(self, *_args, **_kwargs)
+        return val
+    def SetMarginsXY(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SetMarginsXY(self, *_args, **_kwargs)
+        return val
+    def SetSelectionBackground(self, *_args, **_kwargs):
+        val = windows3c.wxVListBox_SetSelectionBackground(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxVListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxVListBox(wxVListBoxPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = windows3c.new_wxVListBox(*_args,**_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxVListBox)
+        self._setOORInfo(self)
+
+
+
+def wxPreVListBox(*_args,**_kwargs):
+    val = wxVListBoxPtr(windows3c.new_wxPreVListBox(*_args,**_kwargs))
+    val.thisown = 1
+    val._setOORInfo(val)
+    return val
+
+
+class wxHtmlListBoxPtr(wxVListBoxPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = windows3c.wxHtmlListBox__setCallbackInfo(self, *_args, **_kwargs)
+        return val
+    def Create(self, *_args, **_kwargs):
+        val = windows3c.wxHtmlListBox_Create(self, *_args, **_kwargs)
+        return val
+    def RefreshAll(self, *_args, **_kwargs):
+        val = windows3c.wxHtmlListBox_RefreshAll(self, *_args, **_kwargs)
+        return val
+    def SetItemCount(self, *_args, **_kwargs):
+        val = windows3c.wxHtmlListBox_SetItemCount(self, *_args, **_kwargs)
+        return val
+    def __repr__(self):
+        return "<%s.%s instance; proxy of C++ wxHtmlListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
+class wxHtmlListBox(wxHtmlListBoxPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = windows3c.new_wxHtmlListBox(*_args,**_kwargs)
+        self.thisown = 1
+        self._setCallbackInfo(self, wxHtmlListBox)
+        self._setOORInfo(self)
+
+
+
+def wxPreHtmlListBox(*_args,**_kwargs):
+    val = wxHtmlListBoxPtr(windows3c.new_wxPreHtmlListBox(*_args,**_kwargs))

     val.thisown = 1
     val.thisown = 1

-    val._setOORInfo(self)
+    val._setOORInfo(val)

     return val
 
 
     return val