]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/mac/_windows.py
applied patch 1378261
[wxWidgets.git] / wxPython / src / mac / _windows.py
index 5611960479e131136eb4134863f7ef014d7c996e..f6b9d46229b2c468cdda44a4cf4c23febbf60096 100644 (file)
@@ -1,18 +1,18 @@
-# This file was created automatically by SWIG.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 import _windows_
-
+import new
+new_instancemethod = new.instancemethod
 def _swig_setattr_nondynamic(self,class_type,name,value,static=1):
+    if (name == "thisown"): return self.this.own(value)
     if (name == "this"):
-        if isinstance(value, class_type):
-            self.__dict__[name] = value.this
-            if hasattr(value,"thisown"): self.__dict__["thisown"] = value.thisown
-            del value.thisown
+        if type(value).__name__ == 'PySwigObject':
+            self.__dict__[name] = value
             return
     method = class_type.__swig_setmethods__.get(name,None)
     if method: return method(self,value)
-    if (not static) or hasattr(self,name) or (name == "thisown"):
+    if (not static) or hasattr(self,name):
         self.__dict__[name] = value
     else:
         raise AttributeError("You cannot add attributes to %s" % self)
@@ -21,10 +21,16 @@ def _swig_setattr(self,class_type,name,value):
     return _swig_setattr_nondynamic(self,class_type,name,value,0)
 
 def _swig_getattr(self,class_type,name):
+    if (name == "thisown"): return self.this.own()
     method = class_type.__swig_getmethods__.get(name,None)
     if method: return method(self)
     raise AttributeError,name
 
+def _swig_repr(self):
+    try: strthis = "proxy of " + self.this.__repr__()
+    except: strthis = ""
+    return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,)
+
 import types
 try:
     _object = types.ObjectType
@@ -37,7 +43,8 @@ del types
 
 def _swig_setattr_nondynamic_method(set):
     def set_attr(self,name,value):
-        if hasattr(self,name) or (name in ("this", "thisown")):
+        if (name == "thisown"): return self.this.own(value)
+        if hasattr(self,name) or (name == "this"):
             set(self,name,value)
         else:
             raise AttributeError("You cannot add attributes to %s" % self)
@@ -50,18 +57,15 @@ wx = _core
 
 class Panel(_core.Window):
     """Proxy of C++ Panel class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxTAB_TRAVERSAL|wxNO_BORDER, 
             String name=PanelNameStr) -> Panel
         """
-        newobj = _windows_.new_Panel(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.Panel_swiginit(self,_windows_.new_Panel(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -74,27 +78,6 @@ class Panel(_core.Window):
         """
         return _windows_.Panel_Create(*args, **kwargs)
 
-    def InitDialog(*args, **kwargs):
-        """
-        InitDialog(self)
-
-        Sends an EVT_INIT_DIALOG event, whose handler usually transfers data
-        to the dialog via validators.
-        """
-        return _windows_.Panel_InitDialog(*args, **kwargs)
-
-    def SetFocus(*args, **kwargs):
-        """
-        SetFocus(self)
-
-        Overrides `wx.Window.SetFocus`.  This method uses the (undocumented)
-        mix-in class wxControlContainer which manages the focus and TAB logic
-        for controls which usually have child controls.  In practice, if you
-        call this method and the panel has at least one child window, then the
-        focus will be given to the child window.
-        """
-        return _windows_.Panel_SetFocus(*args, **kwargs)
-
     def SetFocusIgnoringChildren(*args, **kwargs):
         """
         SetFocusIgnoringChildren(self)
@@ -123,22 +106,16 @@ class Panel(_core.Window):
         return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-
-class PanelPtr(Panel):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Panel
-_windows_.Panel_swigregister(PanelPtr)
+Panel_swigregister = _windows_.Panel_swigregister
+Panel_swigregister(Panel)
 
 def PrePanel(*args, **kwargs):
     """PrePanel() -> Panel"""
     val = _windows_.new_PrePanel(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def Panel_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     Panel_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -152,24 +129,21 @@ def Panel_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class ScrolledWindow(Panel):
     """Proxy of C++ ScrolledWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL, 
             String name=PanelNameStr) -> ScrolledWindow
         """
-        newobj = _windows_.new_ScrolledWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.ScrolledWindow_swiginit(self,_windows_.new_ScrolledWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -305,22 +279,16 @@ class ScrolledWindow(Panel):
         return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-
-class ScrolledWindowPtr(ScrolledWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ScrolledWindow
-_windows_.ScrolledWindow_swigregister(ScrolledWindowPtr)
+ScrolledWindow_swigregister = _windows_.ScrolledWindow_swigregister
+ScrolledWindow_swigregister(ScrolledWindow)
 
 def PreScrolledWindow(*args, **kwargs):
     """PreScrolledWindow() -> ScrolledWindow"""
     val = _windows_.new_PreScrolledWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     ScrolledWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -334,7 +302,7 @@ def ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
@@ -360,6 +328,8 @@ FRAME_NO_WINDOW_MENU = _windows_.FRAME_NO_WINDOW_MENU
 FRAME_NO_TASKBAR = _windows_.FRAME_NO_TASKBAR
 FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_DRAWER = _windows_.FRAME_DRAWER
+FRAME_EX_METAL = _windows_.FRAME_EX_METAL
+DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL
 DIALOG_MODAL = _windows_.DIALOG_MODAL
 DIALOG_MODELESS = _windows_.DIALOG_MODELESS
 USER_COLOURS = _windows_.USER_COLOURS
@@ -375,9 +345,9 @@ USER_ATTENTION_INFO = _windows_.USER_ATTENTION_INFO
 USER_ATTENTION_ERROR = _windows_.USER_ATTENTION_ERROR
 class TopLevelWindow(_core.Window):
     """Proxy of C++ TopLevelWindow class"""
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTopLevelWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
     def Maximize(*args, **kwargs):
         """Maximize(self, bool maximize=True)"""
         return _windows_.TopLevelWindow_Maximize(*args, **kwargs)
@@ -419,19 +389,11 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_IsFullScreen(*args, **kwargs)
 
     def SetTitle(*args, **kwargs):
-        """
-        SetTitle(self, String title)
-
-        Sets the window's title. Applicable only to frames and dialogs.
-        """
+        """SetTitle(self, String title)"""
         return _windows_.TopLevelWindow_SetTitle(*args, **kwargs)
 
     def GetTitle(*args, **kwargs):
-        """
-        GetTitle(self) -> String
-
-        Gets the window's title. Applicable only to frames and dialogs.
-        """
+        """GetTitle(self) -> String"""
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
     def SetShape(*args, **kwargs):
@@ -454,13 +416,17 @@ class TopLevelWindow(_core.Window):
         """MacGetMetalAppearance(self) -> bool"""
         return _windows_.TopLevelWindow_MacGetMetalAppearance(*args, **kwargs)
 
+    def CenterOnScreen(*args, **kwargs):
+        """
+        CenterOnScreen(self, int dir=BOTH)
+
+        Center the window on screen
+        """
+        return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs)
 
-class TopLevelWindowPtr(TopLevelWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TopLevelWindow
-_windows_.TopLevelWindow_swigregister(TopLevelWindowPtr)
+    CentreOnScreen = CenterOnScreen 
+TopLevelWindow_swigregister = _windows_.TopLevelWindow_swigregister
+TopLevelWindow_swigregister(TopLevelWindow)
 cvar = _windows_.cvar
 FrameNameStr = cvar.FrameNameStr
 DialogNameStr = cvar.DialogNameStr
@@ -471,18 +437,15 @@ ToolBarNameStr = cvar.ToolBarNameStr
 
 class Frame(TopLevelWindow):
     """Proxy of C++ Frame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> Frame
         """
-        newobj = _windows_.new_Frame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.Frame_swiginit(self,_windows_.new_Frame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -493,16 +456,6 @@ class Frame(TopLevelWindow):
         """
         return _windows_.Frame_Create(*args, **kwargs)
 
-    def GetClientAreaOrigin(*args, **kwargs):
-        """
-        GetClientAreaOrigin(self) -> Point
-
-        Get the origin of the client area of the window relative to the
-        window's top left corner (the client area may be shifted because of
-        the borders, scrollbars, other decorations...)
-        """
-        return _windows_.Frame_GetClientAreaOrigin(*args, **kwargs)
-
     def SendSizeEvent(*args, **kwargs):
         """SendSizeEvent(self)"""
         return _windows_.Frame_SendSizeEvent(*args, **kwargs)
@@ -522,7 +475,7 @@ class Frame(TopLevelWindow):
     Command = ProcessCommand 
     def CreateStatusBar(*args, **kwargs):
         """
-        CreateStatusBar(self, int number=1, long style=ST_SIZEGRIP, int winid=0, 
+        CreateStatusBar(self, int number=1, long style=DEFAULT_STATUSBAR_STYLE, int winid=0, 
             String name=StatusLineNameStr) -> StatusBar
         """
         return _windows_.Frame_CreateStatusBar(*args, **kwargs)
@@ -597,22 +550,16 @@ class Frame(TopLevelWindow):
         return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-
-class FramePtr(Frame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Frame
-_windows_.Frame_swigregister(FramePtr)
+Frame_swigregister = _windows_.Frame_swigregister
+Frame_swigregister(Frame)
 
 def PreFrame(*args, **kwargs):
     """PreFrame() -> Frame"""
     val = _windows_.new_PreFrame(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def Frame_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     Frame_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -626,24 +573,22 @@ def Frame_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class Dialog(TopLevelWindow):
     """Proxy of C++ Dialog class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    ButtonSizerFlags = _windows_.Dialog_ButtonSizerFlags
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=DEFAULT_DIALOG_STYLE, String name=DialogNameStr) -> Dialog
         """
-        newobj = _windows_.new_Dialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.Dialog_swiginit(self,_windows_.new_Dialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -662,12 +607,28 @@ class Dialog(TopLevelWindow):
         """GetReturnCode(self) -> int"""
         return _windows_.Dialog_GetReturnCode(*args, **kwargs)
 
+    def SetAffirmativeId(*args, **kwargs):
+        """SetAffirmativeId(self, int affirmativeId)"""
+        return _windows_.Dialog_SetAffirmativeId(*args, **kwargs)
+
+    def GetAffirmativeId(*args, **kwargs):
+        """GetAffirmativeId(self) -> int"""
+        return _windows_.Dialog_GetAffirmativeId(*args, **kwargs)
+
+    def SetEscapeId(*args, **kwargs):
+        """SetEscapeId(self, int escapeId)"""
+        return _windows_.Dialog_SetEscapeId(*args, **kwargs)
+
+    def GetEscapeId(*args, **kwargs):
+        """GetEscapeId(self) -> int"""
+        return _windows_.Dialog_GetEscapeId(*args, **kwargs)
+
     def CreateTextSizer(*args, **kwargs):
         """CreateTextSizer(self, String message) -> Sizer"""
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
     def CreateButtonSizer(*args, **kwargs):
-        """CreateButtonSizer(self, long flags) -> Sizer"""
+        """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer"""
         return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):
@@ -704,25 +665,16 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-    def SendSizeEvent(self):
-        self.ProcessEvent(wx.SizeEvent((-1,-1)))
-
-
-class DialogPtr(Dialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Dialog
-_windows_.Dialog_swigregister(DialogPtr)
+Dialog_swigregister = _windows_.Dialog_swigregister
+Dialog_swigregister(Dialog)
 
 def PreDialog(*args, **kwargs):
     """PreDialog() -> Dialog"""
     val = _windows_.new_PreDialog(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def Dialog_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     Dialog_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -736,24 +688,21 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
 class MiniFrame(Frame):
     """Proxy of C++ MiniFrame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMiniFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> MiniFrame
         """
-        newobj = _windows_.new_MiniFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MiniFrame_swiginit(self,_windows_.new_MiniFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -764,18 +713,12 @@ class MiniFrame(Frame):
         """
         return _windows_.MiniFrame_Create(*args, **kwargs)
 
-
-class MiniFramePtr(MiniFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MiniFrame
-_windows_.MiniFrame_swigregister(MiniFramePtr)
+MiniFrame_swigregister = _windows_.MiniFrame_swigregister
+MiniFrame_swigregister(MiniFrame)
 
 def PreMiniFrame(*args, **kwargs):
     """PreMiniFrame() -> MiniFrame"""
     val = _windows_.new_PreMiniFrame(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
@@ -787,17 +730,14 @@ SPLASH_TIMEOUT = _windows_.SPLASH_TIMEOUT
 SPLASH_NO_TIMEOUT = _windows_.SPLASH_NO_TIMEOUT
 class SplashScreenWindow(_core.Window):
     """Proxy of C++ SplashScreenWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplashScreenWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Bitmap bitmap, Window parent, int id, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=NO_BORDER) -> SplashScreenWindow
         """
-        newobj = _windows_.new_SplashScreenWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SplashScreenWindow_swiginit(self,_windows_.new_SplashScreenWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def SetBitmap(*args, **kwargs):
@@ -808,28 +748,20 @@ class SplashScreenWindow(_core.Window):
         """GetBitmap(self) -> Bitmap"""
         return _windows_.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
-
-class SplashScreenWindowPtr(SplashScreenWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SplashScreenWindow
-_windows_.SplashScreenWindow_swigregister(SplashScreenWindowPtr)
+SplashScreenWindow_swigregister = _windows_.SplashScreenWindow_swigregister
+SplashScreenWindow_swigregister(SplashScreenWindow)
 
 class SplashScreen(Frame):
     """Proxy of C++ SplashScreen class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplashScreen instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Bitmap bitmap, long splashStyle, int milliseconds, 
             Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) -> SplashScreen
         """
-        newobj = _windows_.new_SplashScreen(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SplashScreen_swiginit(self,_windows_.new_SplashScreen(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetSplashStyle(*args, **kwargs):
@@ -844,13 +776,8 @@ class SplashScreen(Frame):
         """GetTimeout(self) -> int"""
         return _windows_.SplashScreen_GetTimeout(*args, **kwargs)
 
-
-class SplashScreenPtr(SplashScreen):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SplashScreen
-_windows_.SplashScreen_swigregister(SplashScreenPtr)
+SplashScreen_swigregister = _windows_.SplashScreen_swigregister
+SplashScreen_swigregister(SplashScreen)
 
 #---------------------------------------------------------------------------
 
@@ -859,14 +786,14 @@ SB_FLAT = _windows_.SB_FLAT
 SB_RAISED = _windows_.SB_RAISED
 class StatusBar(_core.Window):
     """Proxy of C++ StatusBar class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStatusBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, Window parent, int id=-1, long style=ST_SIZEGRIP, String name=StatusLineNameStr) -> StatusBar"""
-        newobj = _windows_.new_StatusBar(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, int id=-1, long style=DEFAULT_STATUSBAR_STYLE, 
+            String name=StatusLineNameStr) -> StatusBar
+        """
+        _windows_.StatusBar_swiginit(self,_windows_.new_StatusBar(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -939,22 +866,16 @@ class StatusBar(_core.Window):
         return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-
-class StatusBarPtr(StatusBar):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = StatusBar
-_windows_.StatusBar_swigregister(StatusBarPtr)
+StatusBar_swigregister = _windows_.StatusBar_swigregister
+StatusBar_swigregister(StatusBar)
 
 def PreStatusBar(*args, **kwargs):
     """PreStatusBar() -> StatusBar"""
     val = _windows_.new_PreStatusBar(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def StatusBar_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     StatusBar_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -968,7 +889,7 @@ def StatusBar_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
 
 #---------------------------------------------------------------------------
 
@@ -992,9 +913,9 @@ class SplitterWindow(_core.Window):
     optional vertical or horizontal split which can be used with the mouse
     or programmatically.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplitterWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=SP_3D, String name=SplitterNameStr) -> SplitterWindow
@@ -1002,10 +923,7 @@ class SplitterWindow(_core.Window):
         Constructor.  Creates and shows a SplitterWindow.
         """
         if kwargs.has_key('point'): kwargs['pos'] = kwargs['point'];del kwargs['point']
-        newobj = _windows_.new_SplitterWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SplitterWindow_swiginit(self,_windows_.new_SplitterWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -1057,7 +975,7 @@ class SplitterWindow(_core.Window):
 
         Initializes the splitter window to have one pane.  This should be
         called if you wish to initially view only a single pane in the
-        splitter window.
+        splitter window.  The child window is shown if it is currently hidden.
         """
         return _windows_.SplitterWindow_Initialize(*args, **kwargs)
 
@@ -1065,7 +983,8 @@ class SplitterWindow(_core.Window):
         """
         SplitVertically(self, Window window1, Window window2, int sashPosition=0) -> bool
 
-        Initializes the left and right panes of the splitter window.
+        Initializes the left and right panes of the splitter window.  The
+        child windows are shown if they are currently hidden.
         """
         return _windows_.SplitterWindow_SplitVertically(*args, **kwargs)
 
@@ -1073,7 +992,8 @@ class SplitterWindow(_core.Window):
         """
         SplitHorizontally(self, Window window1, Window window2, int sashPosition=0) -> bool
 
-        Initializes the top and bottom panes of the splitter window.
+        Initializes the top and bottom panes of the splitter window.  The
+        child windows are shown if they are currently hidden.
         """
         return _windows_.SplitterWindow_SplitHorizontally(*args, **kwargs)
 
@@ -1138,7 +1058,7 @@ class SplitterWindow(_core.Window):
         """
         SetSashSize(self, int width)
 
-        Sets the sash size.  Currently a NOP.
+        Sets the sash size.
         """
         return _windows_.SplitterWindow_SetSashSize(*args, **kwargs)
 
@@ -1270,13 +1190,8 @@ class SplitterWindow(_core.Window):
         return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-
-class SplitterWindowPtr(SplitterWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SplitterWindow
-_windows_.SplitterWindow_swigregister(SplitterWindowPtr)
+SplitterWindow_swigregister = _windows_.SplitterWindow_swigregister
+SplitterWindow_swigregister(SplitterWindow)
 SplitterNameStr = cvar.SplitterNameStr
 
 def PreSplitterWindow(*args, **kwargs):
@@ -1286,11 +1201,10 @@ def PreSplitterWindow(*args, **kwargs):
     Precreate a SplitterWindow for 2-phase creation.
     """
     val = _windows_.new_PreSplitterWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def SplitterWindow_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     SplitterWindow_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -1304,27 +1218,24 @@ def SplitterWindow_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
+  return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
 
 class SplitterEvent(_core.NotifyEvent):
     """This class represents the events generated by a splitter control."""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSplitterEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent
 
         This class represents the events generated by a splitter control.
         """
-        newobj = _windows_.new_SplitterEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SplitterEvent_swiginit(self,_windows_.new_SplitterEvent(*args, **kwargs))
     def SetSashPosition(*args, **kwargs):
         """
         SetSashPosition(self, int pos)
 
-        This funciton is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
+        This function is only meaningful during EVT_SPLITTER_SASH_POS_CHANGING
         and EVT_SPLITTER_SASH_POS_CHANGED events.  In the case of _CHANGED
         events, sets the the new sash position. In the case of _CHANGING
         events, sets the new tracking bar position so visual feedback during
@@ -1369,13 +1280,8 @@ class SplitterEvent(_core.NotifyEvent):
         """
         return _windows_.SplitterEvent_GetY(*args, **kwargs)
 
-
-class SplitterEventPtr(SplitterEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SplitterEvent
-_windows_.SplitterEvent_swigregister(SplitterEventPtr)
+SplitterEvent_swigregister = _windows_.SplitterEvent_swigregister
+SplitterEvent_swigregister(SplitterEvent)
 
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
@@ -1404,18 +1310,15 @@ SASH_LEFT = _windows_.SASH_LEFT
 SASH_NONE = _windows_.SASH_NONE
 class SashWindow(_core.Window):
     """Proxy of C++ SashWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 
             String name=SashNameStr) -> SashWindow
         """
-        newobj = _windows_.new_SashWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SashWindow_swiginit(self,_windows_.new_SashWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -1502,34 +1405,25 @@ class SashWindow(_core.Window):
         """SizeWindows(self)"""
         return _windows_.SashWindow_SizeWindows(*args, **kwargs)
 
-
-class SashWindowPtr(SashWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SashWindow
-_windows_.SashWindow_swigregister(SashWindowPtr)
+SashWindow_swigregister = _windows_.SashWindow_swigregister
+SashWindow_swigregister(SashWindow)
 SashNameStr = cvar.SashNameStr
 SashLayoutNameStr = cvar.SashLayoutNameStr
 
 def PreSashWindow(*args, **kwargs):
     """PreSashWindow() -> SashWindow"""
     val = _windows_.new_PreSashWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 SASH_STATUS_OK = _windows_.SASH_STATUS_OK
 SASH_STATUS_OUT_OF_RANGE = _windows_.SASH_STATUS_OUT_OF_RANGE
 class SashEvent(_core.CommandEvent):
     """Proxy of C++ SashEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, int id=0, int edge=SASH_NONE) -> SashEvent"""
-        newobj = _windows_.new_SashEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SashEvent_swiginit(self,_windows_.new_SashEvent(*args, **kwargs))
     def SetEdge(*args, **kwargs):
         """SetEdge(self, int edge)"""
         return _windows_.SashEvent_SetEdge(*args, **kwargs)
@@ -1554,13 +1448,8 @@ class SashEvent(_core.CommandEvent):
         """GetDragStatus(self) -> int"""
         return _windows_.SashEvent_GetDragStatus(*args, **kwargs)
 
-
-class SashEventPtr(SashEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SashEvent
-_windows_.SashEvent_swigregister(SashEventPtr)
+SashEvent_swigregister = _windows_.SashEvent_swigregister
+SashEvent_swigregister(SashEvent)
 
 wxEVT_SASH_DRAGGED = _windows_.wxEVT_SASH_DRAGGED
 EVT_SASH_DRAGGED = wx.PyEventBinder( wxEVT_SASH_DRAGGED, 1 )
@@ -1583,14 +1472,11 @@ wxEVT_QUERY_LAYOUT_INFO = _windows_.wxEVT_QUERY_LAYOUT_INFO
 wxEVT_CALCULATE_LAYOUT = _windows_.wxEVT_CALCULATE_LAYOUT
 class QueryLayoutInfoEvent(_core.Event):
     """Proxy of C++ QueryLayoutInfoEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxQueryLayoutInfoEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, int id=0) -> QueryLayoutInfoEvent"""
-        newobj = _windows_.new_QueryLayoutInfoEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.QueryLayoutInfoEvent_swiginit(self,_windows_.new_QueryLayoutInfoEvent(*args, **kwargs))
     def SetRequestedLength(*args, **kwargs):
         """SetRequestedLength(self, int length)"""
         return _windows_.QueryLayoutInfoEvent_SetRequestedLength(*args, **kwargs)
@@ -1631,24 +1517,16 @@ class QueryLayoutInfoEvent(_core.Event):
         """GetAlignment(self) -> int"""
         return _windows_.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
-
-class QueryLayoutInfoEventPtr(QueryLayoutInfoEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = QueryLayoutInfoEvent
-_windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEventPtr)
+QueryLayoutInfoEvent_swigregister = _windows_.QueryLayoutInfoEvent_swigregister
+QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent)
 
 class CalculateLayoutEvent(_core.Event):
     """Proxy of C++ CalculateLayoutEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalculateLayoutEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, int id=0) -> CalculateLayoutEvent"""
-        newobj = _windows_.new_CalculateLayoutEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.CalculateLayoutEvent_swiginit(self,_windows_.new_CalculateLayoutEvent(*args, **kwargs))
     def SetFlags(*args, **kwargs):
         """SetFlags(self, int flags)"""
         return _windows_.CalculateLayoutEvent_SetFlags(*args, **kwargs)
@@ -1665,31 +1543,23 @@ class CalculateLayoutEvent(_core.Event):
         """GetRect(self) -> Rect"""
         return _windows_.CalculateLayoutEvent_GetRect(*args, **kwargs)
 
-
-class CalculateLayoutEventPtr(CalculateLayoutEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = CalculateLayoutEvent
-_windows_.CalculateLayoutEvent_swigregister(CalculateLayoutEventPtr)
+CalculateLayoutEvent_swigregister = _windows_.CalculateLayoutEvent_swigregister
+CalculateLayoutEvent_swigregister(CalculateLayoutEvent)
 
 EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
 
 class SashLayoutWindow(SashWindow):
     """Proxy of C++ SashLayoutWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSashLayoutWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=wxCLIP_CHILDREN|wxSW_3D, 
             String name=SashLayoutNameStr) -> SashLayoutWindow
         """
-        newobj = _windows_.new_SashLayoutWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SashLayoutWindow_swiginit(self,_windows_.new_SashLayoutWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -1720,36 +1590,23 @@ class SashLayoutWindow(SashWindow):
         """SetOrientation(self, int orientation)"""
         return _windows_.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
-
-class SashLayoutWindowPtr(SashLayoutWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SashLayoutWindow
-_windows_.SashLayoutWindow_swigregister(SashLayoutWindowPtr)
+SashLayoutWindow_swigregister = _windows_.SashLayoutWindow_swigregister
+SashLayoutWindow_swigregister(SashLayoutWindow)
 
 def PreSashLayoutWindow(*args, **kwargs):
     """PreSashLayoutWindow() -> SashLayoutWindow"""
     val = _windows_.new_PreSashLayoutWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class LayoutAlgorithm(_core.Object):
     """Proxy of C++ LayoutAlgorithm class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLayoutAlgorithm instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self) -> LayoutAlgorithm"""
-        newobj = _windows_.new_LayoutAlgorithm(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_LayoutAlgorithm):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.LayoutAlgorithm_swiginit(self,_windows_.new_LayoutAlgorithm(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_LayoutAlgorithm
+    __del__ = lambda self : None;
     def LayoutMDIFrame(*args, **kwargs):
         """LayoutMDIFrame(self, MDIParentFrame frame, Rect rect=None) -> bool"""
         return _windows_.LayoutAlgorithm_LayoutMDIFrame(*args, **kwargs)
@@ -1762,74 +1619,48 @@ class LayoutAlgorithm(_core.Object):
         """LayoutWindow(self, Window parent, Window mainWindow=None) -> bool"""
         return _windows_.LayoutAlgorithm_LayoutWindow(*args, **kwargs)
 
-
-class LayoutAlgorithmPtr(LayoutAlgorithm):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LayoutAlgorithm
-_windows_.LayoutAlgorithm_swigregister(LayoutAlgorithmPtr)
+LayoutAlgorithm_swigregister = _windows_.LayoutAlgorithm_swigregister
+LayoutAlgorithm_swigregister(LayoutAlgorithm)
 
 class PopupWindow(_core.Window):
     """Proxy of C++ PopupWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPopupWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, int flags=BORDER_NONE) -> PopupWindow"""
-        newobj = _windows_.new_PopupWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class PopupWindowPtr(PopupWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PopupWindow
-_windows_.PopupWindow_swigregister(PopupWindowPtr)
+        _windows_.PopupWindow_swiginit(self,_windows_.new_PopupWindow(*args, **kwargs))
+PopupWindow_swigregister = _windows_.PopupWindow_swigregister
+PopupWindow_swigregister(PopupWindow)
 
 def PrePopupWindow(*args, **kwargs):
     """PrePopupWindow() -> PopupWindow"""
     val = _windows_.new_PrePopupWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class PopupTransientWindow(PopupWindow):
     """Proxy of C++ PopupTransientWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPopupTransientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, int style=BORDER_NONE) -> PopupTransientWindow"""
-        newobj = _windows_.new_PopupTransientWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class PopupTransientWindowPtr(PopupTransientWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PopupTransientWindow
-_windows_.PopupTransientWindow_swigregister(PopupTransientWindowPtr)
+        _windows_.PopupTransientWindow_swiginit(self,_windows_.new_PopupTransientWindow(*args, **kwargs))
+PopupTransientWindow_swigregister = _windows_.PopupTransientWindow_swigregister
+PopupTransientWindow_swigregister(PopupTransientWindow)
 
 def PrePopupTransientWindow(*args, **kwargs):
     """PrePopupTransientWindow() -> PopupTransientWindow"""
     val = _windows_.new_PrePopupTransientWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
 
 class TipWindow(Frame):
     """Proxy of C++ TipWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTipWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, String text, int maxLength=100, Rect rectBound=None) -> TipWindow"""
-        newobj = _windows_.new_TipWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.TipWindow_swiginit(self,_windows_.new_TipWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def SetBoundingRect(*args, **kwargs):
@@ -1847,29 +1678,21 @@ class TipWindow(Frame):
         """
         return _windows_.TipWindow_Close(*args, **kwargs)
 
-
-class TipWindowPtr(TipWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TipWindow
-_windows_.TipWindow_swigregister(TipWindowPtr)
+TipWindow_swigregister = _windows_.TipWindow_swigregister
+TipWindow_swigregister(TipWindow)
 
 #---------------------------------------------------------------------------
 
 class VScrolledWindow(Panel):
     """Proxy of C++ VScrolledWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyVScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow
         """
-        newobj = _windows_.new_VScrolledWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.VScrolledWindow_swiginit(self,_windows_.new_VScrolledWindow(*args, **kwargs))
         self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -1891,28 +1714,6 @@ class VScrolledWindow(Panel):
         """ScrollToLine(self, size_t line) -> bool"""
         return _windows_.VScrolledWindow_ScrollToLine(*args, **kwargs)
 
-    def ScrollLines(*args, **kwargs):
-        """
-        ScrollLines(self, int lines) -> bool
-
-        If the platform and window class supports it, scrolls the window by
-        the given number of lines down, if lines is positive, or up if lines
-        is negative.  Returns True if the window was scrolled, False if it was
-        already on top/bottom and nothing was done.
-        """
-        return _windows_.VScrolledWindow_ScrollLines(*args, **kwargs)
-
-    def ScrollPages(*args, **kwargs):
-        """
-        ScrollPages(self, int pages) -> bool
-
-        If the platform and window class supports it, scrolls the window by
-        the given number of pages down, if pages is positive, or up if pages
-        is negative.  Returns True if the window was scrolled, False if it was
-        already on top/bottom and nothing was done.
-        """
-        return _windows_.VScrolledWindow_ScrollPages(*args, **kwargs)
-
     def RefreshLine(*args, **kwargs):
         """RefreshLine(self, size_t line)"""
         return _windows_.VScrolledWindow_RefreshLine(*args, **kwargs)
@@ -1945,6 +1746,18 @@ class VScrolledWindow(Panel):
         """GetLineCount(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLineCount(*args, **kwargs)
 
+    def GetVisibleBegin(*args, **kwargs):
+        """GetVisibleBegin(self) -> size_t"""
+        return _windows_.VScrolledWindow_GetVisibleBegin(*args, **kwargs)
+
+    def GetVisibleEnd(*args, **kwargs):
+        """GetVisibleEnd(self) -> size_t"""
+        return _windows_.VScrolledWindow_GetVisibleEnd(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(self, size_t line) -> bool"""
+        return _windows_.VScrolledWindow_IsVisible(*args, **kwargs)
+
     def GetFirstVisibleLine(*args, **kwargs):
         """GetFirstVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)
@@ -1953,37 +1766,32 @@ class VScrolledWindow(Panel):
         """GetLastVisibleLine(self) -> size_t"""
         return _windows_.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
 
-    def IsVisible(*args, **kwargs):
-        """IsVisible(self, size_t line) -> bool"""
-        return _windows_.VScrolledWindow_IsVisible(*args, **kwargs)
+    def FindFirstFromBottom(*args, **kwargs):
+        """FindFirstFromBottom(self, size_t lineLast, bool fullyVisible=False) -> size_t"""
+        return _windows_.VScrolledWindow_FindFirstFromBottom(*args, **kwargs)
 
+    def GetLinesHeight(*args, **kwargs):
+        """GetLinesHeight(self, size_t lineMin, size_t lineMax) -> int"""
+        return _windows_.VScrolledWindow_GetLinesHeight(*args, **kwargs)
 
-class VScrolledWindowPtr(VScrolledWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = VScrolledWindow
-_windows_.VScrolledWindow_swigregister(VScrolledWindowPtr)
+VScrolledWindow_swigregister = _windows_.VScrolledWindow_swigregister
+VScrolledWindow_swigregister(VScrolledWindow)
 
 def PreVScrolledWindow(*args, **kwargs):
     """PreVScrolledWindow() -> VScrolledWindow"""
     val = _windows_.new_PreVScrolledWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class VListBox(VScrolledWindow):
     """Proxy of C++ VListBox class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyVListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox
         """
-        newobj = _windows_.new_VListBox(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.VListBox_swiginit(self,_windows_.new_VListBox(*args, **kwargs))
         self._setOORInfo(self);self._setCallbackInfo(self, VListBox)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -2081,34 +1889,33 @@ class VListBox(VScrolledWindow):
         """SetSelectionBackground(self, Colour col)"""
         return _windows_.VListBox_SetSelectionBackground(*args, **kwargs)
 
+    def OnDrawSeparator(*args, **kwargs):
+        """OnDrawSeparator(self, DC dc, Rect rect, size_t n)"""
+        return _windows_.VListBox_OnDrawSeparator(*args, **kwargs)
+
+    def OnDrawBackground(*args, **kwargs):
+        """OnDrawBackground(self, DC dc, Rect rect, size_t n)"""
+        return _windows_.VListBox_OnDrawBackground(*args, **kwargs)
 
-class VListBoxPtr(VListBox):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = VListBox
-_windows_.VListBox_swigregister(VListBoxPtr)
+VListBox_swigregister = _windows_.VListBox_swigregister
+VListBox_swigregister(VListBox)
 VListBoxNameStr = cvar.VListBoxNameStr
 
 def PreVListBox(*args, **kwargs):
     """PreVListBox() -> VListBox"""
     val = _windows_.new_PreVListBox(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class HtmlListBox(VListBox):
     """Proxy of C++ HtmlListBox class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyHtmlListBox instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox
         """
-        newobj = _windows_.new_HtmlListBox(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.HtmlListBox_swiginit(self,_windows_.new_HtmlListBox(*args, **kwargs))
         self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -2122,10 +1929,6 @@ class HtmlListBox(VListBox):
         """
         return _windows_.HtmlListBox_Create(*args, **kwargs)
 
-    def RefreshAll(*args, **kwargs):
-        """RefreshAll(self)"""
-        return _windows_.HtmlListBox_RefreshAll(*args, **kwargs)
-
     def SetItemCount(*args, **kwargs):
         """SetItemCount(self, size_t count)"""
         return _windows_.HtmlListBox_SetItemCount(*args, **kwargs)
@@ -2134,34 +1937,27 @@ class HtmlListBox(VListBox):
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 
-
-class HtmlListBoxPtr(HtmlListBox):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = HtmlListBox
-_windows_.HtmlListBox_swigregister(HtmlListBoxPtr)
+HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
+HtmlListBox_swigregister(HtmlListBox)
 
 def PreHtmlListBox(*args, **kwargs):
     """PreHtmlListBox() -> HtmlListBox"""
     val = _windows_.new_PreHtmlListBox(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
     """Proxy of C++ TaskBarIcon class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTaskBarIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self) -> TaskBarIcon"""
-        newobj = _windows_.new_TaskBarIcon(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.TaskBarIcon_swiginit(self,_windows_.new_TaskBarIcon(*args, **kwargs))
         self._setCallbackInfo(self, TaskBarIcon, 0)
 
+    __swig_destroy__ = _windows_.delete_TaskBarIcon
+    __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
         return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)
@@ -2172,7 +1968,9 @@ class TaskBarIcon(_core.EvtHandler):
 
         Deletes the C++ object this Python object is a proxy for.
         """
-        return _windows_.TaskBarIcon_Destroy(*args, **kwargs)
+        val = _windows_.TaskBarIcon_Destroy(*args, **kwargs)
+        args[0].thisown = 0
+        return val
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
@@ -2195,31 +1993,18 @@ class TaskBarIcon(_core.EvtHandler):
         """PopupMenu(self, Menu menu) -> bool"""
         return _windows_.TaskBarIcon_PopupMenu(*args, **kwargs)
 
-
-class TaskBarIconPtr(TaskBarIcon):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TaskBarIcon
-_windows_.TaskBarIcon_swigregister(TaskBarIconPtr)
+TaskBarIcon_swigregister = _windows_.TaskBarIcon_swigregister
+TaskBarIcon_swigregister(TaskBarIcon)
 
 class TaskBarIconEvent(_core.Event):
     """Proxy of C++ TaskBarIconEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTaskBarIconEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""
-        newobj = _windows_.new_TaskBarIconEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class TaskBarIconEventPtr(TaskBarIconEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TaskBarIconEvent
-_windows_.TaskBarIconEvent_swigregister(TaskBarIconEventPtr)
+        _windows_.TaskBarIconEvent_swiginit(self,_windows_.new_TaskBarIconEvent(*args, **kwargs))
+TaskBarIconEvent_swigregister = _windows_.TaskBarIconEvent_swigregister
+TaskBarIconEvent_swigregister(TaskBarIconEvent)
 
 wxEVT_TASKBAR_MOVE = _windows_.wxEVT_TASKBAR_MOVE
 wxEVT_TASKBAR_LEFT_DOWN = _windows_.wxEVT_TASKBAR_LEFT_DOWN
@@ -2244,24 +2029,17 @@ class ColourData(_core.Object):
     chooser dialog, used to transfer settings and results to and from the
     `wx.ColourDialog`.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxColourData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self) -> ColourData
 
         Constructor, sets default values.
         """
-        newobj = _windows_.new_ColourData(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_ColourData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.ColourData_swiginit(self,_windows_.new_ColourData(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_ColourData
+    __del__ = lambda self : None;
     def GetChooseFull(*args, **kwargs):
         """
         GetChooseFull(self) -> bool
@@ -2318,13 +2096,8 @@ class ColourData(_core.Object):
         """
         return _windows_.ColourData_SetCustomColour(*args, **kwargs)
 
-
-class ColourDataPtr(ColourData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ColourData
-_windows_.ColourData_swigregister(ColourDataPtr)
+ColourData_swigregister = _windows_.ColourData_swigregister
+ColourData_swigregister(ColourData)
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
 DirSelectorPromptStr = cvar.DirSelectorPromptStr
 DirDialogNameStr = cvar.DirDialogNameStr
@@ -2334,9 +2107,9 @@ MessageBoxCaptionStr = cvar.MessageBoxCaptionStr
 
 class ColourDialog(Dialog):
     """This class represents the colour chooser dialog."""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxColourDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, ColourData data=None) -> ColourDialog
 
@@ -2344,10 +2117,7 @@ class ColourDialog(Dialog):
         which will be copied to the colour dialog's internal ColourData
         instance.
         """
-        newobj = _windows_.new_ColourDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.ColourDialog_swiginit(self,_windows_.new_ColourDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetColourData(*args, **kwargs):
@@ -2358,22 +2128,24 @@ class ColourDialog(Dialog):
         """
         return _windows_.ColourDialog_GetColourData(*args, **kwargs)
 
+ColourDialog_swigregister = _windows_.ColourDialog_swigregister
+ColourDialog_swigregister(ColourDialog)
 
-class ColourDialogPtr(ColourDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ColourDialog
-_windows_.ColourDialog_swigregister(ColourDialogPtr)
 
+def GetColourFromUser(*args, **kwargs):
+  """
+    GetColourFromUser(Window parent=(wxWindow *) NULL, Colour colInit=wxNullColour, 
+        String caption=EmptyString) -> Colour
+    """
+  return _windows_.GetColourFromUser(*args, **kwargs)
 class DirDialog(Dialog):
     """
     wx.DirDialog allows the user to select a directory by browising the
     file system.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDirDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, String message=DirSelectorPromptStr, 
             String defaultPath=EmptyString, long style=0, 
@@ -2382,10 +2154,7 @@ class DirDialog(Dialog):
 
         Constructor.  Use ShowModal method to show the dialog.
         """
-        newobj = _windows_.new_DirDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.DirDialog_swiginit(self,_windows_.new_DirDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetPath(*args, **kwargs):
@@ -2428,22 +2197,17 @@ class DirDialog(Dialog):
         """
         return _windows_.DirDialog_SetPath(*args, **kwargs)
 
-
-class DirDialogPtr(DirDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DirDialog
-_windows_.DirDialog_swigregister(DirDialogPtr)
+DirDialog_swigregister = _windows_.DirDialog_swigregister
+DirDialog_swigregister(DirDialog)
 
 class FileDialog(Dialog):
     """
     wx.FileDialog allows the user to select one or more files from the
     filesystem.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, String message=FileSelectorPromptStr, 
             String defaultDir=EmptyString, String defaultFile=EmptyString, 
@@ -2452,10 +2216,7 @@ class FileDialog(Dialog):
 
         Constructor.  Use ShowModal method to show the dialog.
         """
-        newobj = _windows_.new_FileDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.FileDialog_swiginit(self,_windows_.new_FileDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def SetMessage(*args, **kwargs):
@@ -2598,31 +2359,34 @@ class FileDialog(Dialog):
         """
         return _windows_.FileDialog_GetPaths(*args, **kwargs)
 
-
-class FileDialogPtr(FileDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileDialog
-_windows_.FileDialog_swigregister(FileDialogPtr)
+FileDialog_swigregister = _windows_.FileDialog_swigregister
+FileDialog_swigregister(FileDialog)
 
 CHOICEDLG_STYLE = _windows_.CHOICEDLG_STYLE
 class MultiChoiceDialog(Dialog):
     """A simple dialog with a multi selection listbox."""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMultiChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
-        __init__(Window parent, String message, String caption,
-            List choices=[], long style=CHOICEDLG_STYLE,
+        __init__(self, Window parent, String message, String caption,
+            List choices=EmptyList, long style=CHOICEDLG_STYLE,
             Point pos=DefaultPosition) -> MultiChoiceDialog
 
-        Constructor.  Use ShowModal method to show the dialog.
+        Constructor.  Use the `ShowModal` method to show the dialog.
+
+            :param parent: The parent window.
+            :param message: Text to display above the list of selections.
+            :param caption: Text to use in the title bar of the dialog.
+            :param choices: A list of strings or unicode objects that the
+                user is allowed to choose from.
+            :param style: Styles to apply to the dialog.  The default value is
+                equivallent to wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.OK|wx.CANCEL|wx.CENTER.
+            :param pos: Where to position the dialog (not used on Windows)
+
+
         """
-        newobj = _windows_.new_MultiChoiceDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MultiChoiceDialog_swiginit(self,_windows_.new_MultiChoiceDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def SetSelections(*args, **kwargs):
@@ -2630,7 +2394,8 @@ class MultiChoiceDialog(Dialog):
         SetSelections(List selections)
 
         Specify the items in the list that should be selected, using a list of
-        integers.
+        integers.  The list should specify the indexes of the items that
+        should be selected.
         """
         return _windows_.MultiChoiceDialog_SetSelections(*args, **kwargs)
 
@@ -2639,33 +2404,26 @@ class MultiChoiceDialog(Dialog):
         GetSelections() -> [selections]
 
         Returns a list of integers representing the items that are selected.
+        If an item is selected then its index will appear in the list.
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
-
-class MultiChoiceDialogPtr(MultiChoiceDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MultiChoiceDialog
-_windows_.MultiChoiceDialog_swigregister(MultiChoiceDialogPtr)
+MultiChoiceDialog_swigregister = _windows_.MultiChoiceDialog_swigregister
+MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):
     """A simple dialog with a single selection listbox."""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSingleChoiceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(Window parent, String message, String caption,
-            List choices=[], long style=CHOICEDLG_STYLE,
+            List choices=EmptyList, long style=CHOICEDLG_STYLE,
             Point pos=DefaultPosition) -> SingleChoiceDialog
 
         Constructor.  Use ShowModal method to show the dialog.
         """
-        newobj = _windows_.new_SingleChoiceDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.SingleChoiceDialog_swiginit(self,_windows_.new_SingleChoiceDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetSelection(*args, **kwargs):
@@ -2692,20 +2450,15 @@ class SingleChoiceDialog(Dialog):
         """
         return _windows_.SingleChoiceDialog_SetSelection(*args, **kwargs)
 
-
-class SingleChoiceDialogPtr(SingleChoiceDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SingleChoiceDialog
-_windows_.SingleChoiceDialog_swigregister(SingleChoiceDialogPtr)
+SingleChoiceDialog_swigregister = _windows_.SingleChoiceDialog_swigregister
+SingleChoiceDialog_swigregister(SingleChoiceDialog)
 
 TextEntryDialogStyle = _windows_.TextEntryDialogStyle
 class TextEntryDialog(Dialog):
     """A dialog with text control, [ok] and [cancel] buttons"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, String message, String caption=GetTextFromUserPromptStr, 
             String defaultValue=EmptyString, 
@@ -2713,10 +2466,7 @@ class TextEntryDialog(Dialog):
 
         Constructor.  Use ShowModal method to show the dialog.
         """
-        newobj = _windows_.new_TextEntryDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.TextEntryDialog_swiginit(self,_windows_.new_TextEntryDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetValue(*args, **kwargs):
@@ -2736,35 +2486,22 @@ class TextEntryDialog(Dialog):
         """
         return _windows_.TextEntryDialog_SetValue(*args, **kwargs)
 
-
-class TextEntryDialogPtr(TextEntryDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TextEntryDialog
-_windows_.TextEntryDialog_swigregister(TextEntryDialogPtr)
+TextEntryDialog_swigregister = _windows_.TextEntryDialog_swigregister
+TextEntryDialog_swigregister(TextEntryDialog)
 
 class PasswordEntryDialog(TextEntryDialog):
     """Proxy of C++ PasswordEntryDialog class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPasswordEntryDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, String message, String caption=GetPasswordFromUserPromptStr, 
             String value=EmptyString, 
             long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
         """
-        newobj = _windows_.new_PasswordEntryDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class PasswordEntryDialogPtr(PasswordEntryDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PasswordEntryDialog
-_windows_.PasswordEntryDialog_swigregister(PasswordEntryDialogPtr)
+        _windows_.PasswordEntryDialog_swiginit(self,_windows_.new_PasswordEntryDialog(*args, **kwargs))
+PasswordEntryDialog_swigregister = _windows_.PasswordEntryDialog_swigregister
+PasswordEntryDialog_swigregister(PasswordEntryDialog)
 GetPasswordFromUserPromptStr = cvar.GetPasswordFromUserPromptStr
 
 class FontData(_core.Object):
@@ -2772,25 +2509,18 @@ class FontData(_core.Object):
     This class holds a variety of information related to font dialogs and
     is used to transfer settings to and results from a `wx.FontDialog`.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFontData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self) -> FontData
 
         This class holds a variety of information related to font dialogs and
         is used to transfer settings to and results from a `wx.FontDialog`.
         """
-        newobj = _windows_.new_FontData(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_FontData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.FontData_swiginit(self,_windows_.new_FontData(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_FontData
+    __del__ = lambda self : None;
     def EnableEffects(*args, **kwargs):
         """
         EnableEffects(self, bool enable)
@@ -2907,13 +2637,8 @@ class FontData(_core.Object):
         """
         return _windows_.FontData_SetShowHelp(*args, **kwargs)
 
-
-class FontDataPtr(FontData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FontData
-_windows_.FontData_swigregister(FontDataPtr)
+FontData_swigregister = _windows_.FontData_swigregister
+FontData_swigregister(FontData)
 
 class FontDialog(Dialog):
     """
@@ -2922,9 +2647,9 @@ class FontDialog(Dialog):
     :see: `wx.FontData`
 
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFontDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, FontData data) -> FontDialog
 
@@ -2933,10 +2658,7 @@ class FontDialog(Dialog):
         the dialog.  If ShowModal returns ``wx.ID_OK`` then you can fetch the
         results with via the `wx.FontData` returned by `GetFontData`.
         """
-        newobj = _windows_.new_FontDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.FontDialog_swiginit(self,_windows_.new_FontDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetFontData(*args, **kwargs):
@@ -2948,22 +2670,21 @@ class FontDialog(Dialog):
         """
         return _windows_.FontDialog_GetFontData(*args, **kwargs)
 
+FontDialog_swigregister = _windows_.FontDialog_swigregister
+FontDialog_swigregister(FontDialog)
 
-class FontDialogPtr(FontDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FontDialog
-_windows_.FontDialog_swigregister(FontDialogPtr)
 
+def GetFontFromUser(*args, **kwargs):
+  """GetFontFromUser(Window parent=None, Font fontInit=wxNullFont, String caption=EmptyString) -> Font"""
+  return _windows_.GetFontFromUser(*args, **kwargs)
 class MessageDialog(Dialog):
     """
     This class provides a simple dialog that shows a single or multi-line
     message, with a choice of OK, Yes, No and/or Cancel buttons.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMessageDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, String message, String caption=MessageBoxCaptionStr, 
             long style=wxOK|wxCANCEL|wxCENTRE, 
@@ -2971,28 +2692,20 @@ class MessageDialog(Dialog):
 
         Constructor, use `ShowModal` to display the dialog.
         """
-        newobj = _windows_.new_MessageDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MessageDialog_swiginit(self,_windows_.new_MessageDialog(*args, **kwargs))
         self._setOORInfo(self)
 
-
-class MessageDialogPtr(MessageDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MessageDialog
-_windows_.MessageDialog_swigregister(MessageDialogPtr)
+MessageDialog_swigregister = _windows_.MessageDialog_swigregister
+MessageDialog_swigregister(MessageDialog)
 
 class ProgressDialog(Frame):
     """
     A dialog that shows a short message and a progress bar. Optionally, it
     can display an ABORT button.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxProgressDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, String title, String message, int maximum=100, Window parent=None, 
             int style=wxPD_AUTO_HIDE|wxPD_APP_MODAL) -> ProgressDialog
@@ -3001,10 +2714,7 @@ class ProgressDialog(Frame):
         for other windows, or, if wx.PD_APP_MODAL flag is not given, for its
         parent window only.
         """
-        newobj = _windows_.new_ProgressDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.ProgressDialog_swiginit(self,_windows_.new_ProgressDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def Update(*args, **kwargs):
@@ -3032,13 +2742,8 @@ class ProgressDialog(Frame):
         """
         return _windows_.ProgressDialog_Resume(*args, **kwargs)
 
-
-class ProgressDialogPtr(ProgressDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ProgressDialog
-_windows_.ProgressDialog_swigregister(ProgressDialogPtr)
+ProgressDialog_swigregister = _windows_.ProgressDialog_swigregister
+ProgressDialog_swigregister(ProgressDialog)
 
 FR_DOWN = _windows_.FR_DOWN
 FR_WHOLEWORD = _windows_.FR_WHOLEWORD
@@ -3067,18 +2772,15 @@ EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE
 
 class FindDialogEvent(_core.CommandEvent):
     """Events for the FindReplaceDialog"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindDialogEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent
 
         Events for the FindReplaceDialog
         """
-        newobj = _windows_.new_FindDialogEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.FindDialogEvent_swiginit(self,_windows_.new_FindDialogEvent(*args, **kwargs))
     def GetFlags(*args, **kwargs):
         """
         GetFlags(self) -> int
@@ -3125,13 +2827,8 @@ class FindDialogEvent(_core.CommandEvent):
         """SetReplaceString(self, String str)"""
         return _windows_.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
-
-class FindDialogEventPtr(FindDialogEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FindDialogEvent
-_windows_.FindDialogEvent_swigregister(FindDialogEventPtr)
+FindDialogEvent_swigregister = _windows_.FindDialogEvent_swigregister
+FindDialogEvent_swigregister(FindDialogEvent)
 
 class FindReplaceData(_core.Object):
     """
@@ -3144,24 +2841,17 @@ class FindReplaceData(_core.Object):
     Note that all SetXXX() methods may only be called before showing the
     dialog and calling them has no effect later.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindReplaceData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, int flags=0) -> FindReplaceData
 
         Constuctor initializes the flags to default value (0).
         """
-        newobj = _windows_.new_FindReplaceData(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_FindReplaceData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.FindReplaceData_swiginit(self,_windows_.new_FindReplaceData(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_FindReplaceData
+    __del__ = lambda self : None;
     def GetFindString(*args, **kwargs):
         """
         GetFindString(self) -> String
@@ -3210,13 +2900,8 @@ class FindReplaceData(_core.Object):
         """
         return _windows_.FindReplaceData_SetReplaceString(*args, **kwargs)
 
-
-class FindReplaceDataPtr(FindReplaceData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FindReplaceData
-_windows_.FindReplaceData_swigregister(FindReplaceDataPtr)
+FindReplaceData_swigregister = _windows_.FindReplaceData_swigregister
+FindReplaceData_swigregister(FindReplaceData)
 
 class FindReplaceDialog(Dialog):
     """
@@ -3228,9 +2913,9 @@ class FindReplaceDialog(Dialog):
     window. Also note that there is no way to use this dialog in a modal
     way; it is always, by design and implementation, modeless.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFindReplaceDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, FindReplaceData data, String title, 
             int style=0) -> FindReplaceDialog
@@ -3238,10 +2923,7 @@ class FindReplaceDialog(Dialog):
         Create a FindReplaceDialog.  The parent and data parameters must be
         non-None.  Use Show to display the dialog.
         """
-        newobj = _windows_.new_FindReplaceDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.FindReplaceDialog_swiginit(self,_windows_.new_FindReplaceDialog(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -3269,13 +2951,8 @@ class FindReplaceDialog(Dialog):
         """
         return _windows_.FindReplaceDialog_SetData(*args, **kwargs)
 
-
-class FindReplaceDialogPtr(FindReplaceDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FindReplaceDialog
-_windows_.FindReplaceDialog_swigregister(FindReplaceDialogPtr)
+FindReplaceDialog_swigregister = _windows_.FindReplaceDialog_swigregister
+FindReplaceDialog_swigregister(FindReplaceDialog)
 
 def PreFindReplaceDialog(*args, **kwargs):
     """
@@ -3284,7 +2961,6 @@ def PreFindReplaceDialog(*args, **kwargs):
     Precreate a FindReplaceDialog for 2-phase creation
     """
     val = _windows_.new_PreFindReplaceDialog(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
@@ -3295,23 +2971,21 @@ IDM_WINDOWCASCADE = _windows_.IDM_WINDOWCASCADE
 IDM_WINDOWICONS = _windows_.IDM_WINDOWICONS
 IDM_WINDOWNEXT = _windows_.IDM_WINDOWNEXT
 IDM_WINDOWTILEVERT = _windows_.IDM_WINDOWTILEVERT
+IDM_WINDOWPREV = _windows_.IDM_WINDOWPREV
 FIRST_MDI_CHILD = _windows_.FIRST_MDI_CHILD
 LAST_MDI_CHILD = _windows_.LAST_MDI_CHILD
 class MDIParentFrame(Frame):
     """Proxy of C++ MDIParentFrame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIParentFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=wxDEFAULT_FRAME_STYLE|wxVSCROLL|wxHSCROLL, 
             String name=FrameNameStr) -> MDIParentFrame
         """
-        newobj = _windows_.new_MDIParentFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MDIParentFrame_swiginit(self,_windows_.new_MDIParentFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -3352,38 +3026,29 @@ class MDIParentFrame(Frame):
         return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
 
     def Tile(*args, **kwargs):
-        """Tile(self)"""
+        """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
-
-class MDIParentFramePtr(MDIParentFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MDIParentFrame
-_windows_.MDIParentFrame_swigregister(MDIParentFramePtr)
+MDIParentFrame_swigregister = _windows_.MDIParentFrame_swigregister
+MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):
     """PreMDIParentFrame() -> MDIParentFrame"""
     val = _windows_.new_PreMDIParentFrame(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class MDIChildFrame(Frame):
     """Proxy of C++ MDIChildFrame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIChildFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, MDIParentFrame parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=DEFAULT_FRAME_STYLE, 
             String name=FrameNameStr) -> MDIChildFrame
         """
-        newobj = _windows_.new_MDIChildFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MDIChildFrame_swiginit(self,_windows_.new_MDIChildFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -3399,73 +3064,47 @@ class MDIChildFrame(Frame):
         """Activate(self)"""
         return _windows_.MDIChildFrame_Activate(*args, **kwargs)
 
-    def Maximize(*args, **kwargs):
-        """Maximize(self, bool maximize=True)"""
-        return _windows_.MDIChildFrame_Maximize(*args, **kwargs)
-
-    def Restore(*args, **kwargs):
-        """Restore(self)"""
-        return _windows_.MDIChildFrame_Restore(*args, **kwargs)
-
-
-class MDIChildFramePtr(MDIChildFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MDIChildFrame
-_windows_.MDIChildFrame_swigregister(MDIChildFramePtr)
+MDIChildFrame_swigregister = _windows_.MDIChildFrame_swigregister
+MDIChildFrame_swigregister(MDIChildFrame)
 
 def PreMDIChildFrame(*args, **kwargs):
     """PreMDIChildFrame() -> MDIChildFrame"""
     val = _windows_.new_PreMDIChildFrame(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class MDIClientWindow(_core.Window):
     """Proxy of C++ MDIClientWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMDIClientWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, MDIParentFrame parent, long style=0) -> MDIClientWindow"""
-        newobj = _windows_.new_MDIClientWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.MDIClientWindow_swiginit(self,_windows_.new_MDIClientWindow(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
         """Create(self, MDIParentFrame parent, long style=0) -> bool"""
         return _windows_.MDIClientWindow_Create(*args, **kwargs)
 
-
-class MDIClientWindowPtr(MDIClientWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MDIClientWindow
-_windows_.MDIClientWindow_swigregister(MDIClientWindowPtr)
+MDIClientWindow_swigregister = _windows_.MDIClientWindow_swigregister
+MDIClientWindow_swigregister(MDIClientWindow)
 
 def PreMDIClientWindow(*args, **kwargs):
     """PreMDIClientWindow() -> MDIClientWindow"""
     val = _windows_.new_PreMDIClientWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
 
 class PyWindow(_core.Window):
     """Proxy of C++ PyWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow
         """
-        newobj = _windows_.new_PyWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PyWindow_swiginit(self,_windows_.new_PyWindow(*args, **kwargs))
         self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -3476,117 +3115,177 @@ class PyWindow(_core.Window):
         """SetBestSize(self, Size size)"""
         return _windows_.PyWindow_SetBestSize(*args, **kwargs)
 
-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyWindow_base_DoMoveWindow(*args, **kwargs)
-
-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyWindow_base_DoSetSize(*args, **kwargs)
-
-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyWindow_base_DoSetClientSize(*args, **kwargs)
-
-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyWindow_base_DoSetVirtualSize(*args, **kwargs)
-
-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetSize(*args, **kwargs)
-
-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyWindow_base_DoGetClientSize(*args, **kwargs)
-
-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyWindow_base_DoGetPosition(*args, **kwargs)
-
-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyWindow_base_DoGetVirtualSize(*args, **kwargs)
-
-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyWindow_base_DoGetBestSize(*args, **kwargs)
-
-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyWindow_base_InitDialog(*args, **kwargs)
-
-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataToWindow(*args, **kwargs)
-
-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyWindow_base_TransferDataFromWindow(*args, **kwargs)
-
-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyWindow_base_Validate(*args, **kwargs)
-
-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocus(*args, **kwargs)
-
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-
-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyWindow_base_GetMaxSize(*args, **kwargs)
-
-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyWindow_base_AddChild(*args, **kwargs)
-
-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyWindow_base_RemoveChild(*args, **kwargs)
-
-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyWindow_base_ShouldInheritColours(*args, **kwargs)
-
-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyWindow_base_ApplyParentThemeBackground(*args, **kwargs)
-
-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyWindow_base_GetDefaultAttributes(*args, **kwargs)
-
-
-class PyWindowPtr(PyWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyWindow
-_windows_.PyWindow_swigregister(PyWindowPtr)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyWindow_DoEraseBackground(*args, **kwargs)
+
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyWindow_DoMoveWindow(*args, **kwargs)
+
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyWindow_DoSetSize(*args, **kwargs)
+
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyWindow_DoSetClientSize(*args, **kwargs)
+
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyWindow_DoSetVirtualSize(*args, **kwargs)
+
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyWindow_DoGetSize(*args, **kwargs)
+
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyWindow_DoGetClientSize(*args, **kwargs)
+
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyWindow_DoGetPosition(*args, **kwargs)
+
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyWindow_DoGetVirtualSize(*args, **kwargs)
+
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyWindow_DoGetBestSize(*args, **kwargs)
+
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyWindow_GetDefaultAttributes(*args, **kwargs)
+
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyWindow_OnInternalIdle(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kw):
+        return PyWindow.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyWindow.DoMoveWindow instead.")
+
+    def base_DoSetSize(*args, **kw):
+        return PyWindow.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyWindow.DoSetSize instead.")
+
+    def base_DoSetClientSize(*args, **kw):
+        return PyWindow.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyWindow.DoSetClientSize instead.")
+
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyWindow.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyWindow.DoSetVirtualSize instead.")
+
+    def base_DoGetSize(*args, **kw):
+        return PyWindow.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyWindow.DoGetSize instead.")
+
+    def base_DoGetClientSize(*args, **kw):
+        return PyWindow.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyWindow.DoGetClientSize instead.")
+
+    def base_DoGetPosition(*args, **kw):
+        return PyWindow.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyWindow.DoGetPosition instead.")
+
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyWindow.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyWindow.DoGetVirtualSize instead.")
+
+    def base_DoGetBestSize(*args, **kw):
+        return PyWindow.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyWindow.DoGetBestSize instead.")
+
+    def base_InitDialog(*args, **kw):
+        return PyWindow.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyWindow.InitDialog instead.")
+
+    def base_TransferDataToWindow(*args, **kw):
+        return PyWindow.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyWindow.TransferDataToWindow instead.")
+
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyWindow.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyWindow.TransferDataFromWindow instead.")
+
+    def base_Validate(*args, **kw):
+        return PyWindow.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyWindow.Validate instead.")
+
+    def base_AcceptsFocus(*args, **kw):
+        return PyWindow.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyWindow.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyWindow.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyWindow.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyWindow.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyWindow.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyWindow.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyWindow.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyWindow.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyWindow.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyWindow.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyWindow.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyWindow.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyWindow.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyWindow.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyWindow.OnInternalIdle instead.")
+
+PyWindow_swigregister = _windows_.PyWindow_swigregister
+PyWindow_swigregister(PyWindow)
 
 def PrePyWindow(*args, **kwargs):
     """PrePyWindow() -> PyWindow"""
     val = _windows_.new_PrePyWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class PyPanel(Panel):
     """Proxy of C++ PyPanel class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPanel instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel
         """
-        newobj = _windows_.new_PyPanel(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs))
         self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -3597,118 +3296,178 @@ class PyPanel(Panel):
         """SetBestSize(self, Size size)"""
         return _windows_.PyPanel_SetBestSize(*args, **kwargs)
 
-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyPanel_base_DoMoveWindow(*args, **kwargs)
-
-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyPanel_base_DoSetSize(*args, **kwargs)
-
-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyPanel_base_DoSetClientSize(*args, **kwargs)
-
-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyPanel_base_DoSetVirtualSize(*args, **kwargs)
-
-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyPanel_base_DoGetSize(*args, **kwargs)
-
-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyPanel_base_DoGetClientSize(*args, **kwargs)
-
-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyPanel_base_DoGetPosition(*args, **kwargs)
-
-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyPanel_base_DoGetVirtualSize(*args, **kwargs)
-
-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyPanel_base_DoGetBestSize(*args, **kwargs)
-
-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyPanel_base_InitDialog(*args, **kwargs)
-
-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyPanel_base_TransferDataToWindow(*args, **kwargs)
-
-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyPanel_base_TransferDataFromWindow(*args, **kwargs)
-
-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyPanel_base_Validate(*args, **kwargs)
-
-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyPanel_base_AcceptsFocus(*args, **kwargs)
-
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyPanel_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-
-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyPanel_base_GetMaxSize(*args, **kwargs)
-
-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyPanel_base_AddChild(*args, **kwargs)
-
-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyPanel_base_RemoveChild(*args, **kwargs)
-
-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyPanel_base_ShouldInheritColours(*args, **kwargs)
-
-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyPanel_base_ApplyParentThemeBackground(*args, **kwargs)
-
-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyPanel_base_GetDefaultAttributes(*args, **kwargs)
-
-
-class PyPanelPtr(PyPanel):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyPanel
-_windows_.PyPanel_swigregister(PyPanelPtr)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyPanel_DoEraseBackground(*args, **kwargs)
+
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyPanel_DoMoveWindow(*args, **kwargs)
+
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyPanel_DoSetSize(*args, **kwargs)
+
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyPanel_DoSetClientSize(*args, **kwargs)
+
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyPanel_DoSetVirtualSize(*args, **kwargs)
+
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyPanel_DoGetSize(*args, **kwargs)
+
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyPanel_DoGetClientSize(*args, **kwargs)
+
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyPanel_DoGetPosition(*args, **kwargs)
+
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyPanel_DoGetVirtualSize(*args, **kwargs)
+
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyPanel_DoGetBestSize(*args, **kwargs)
+
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyPanel_GetDefaultAttributes(*args, **kwargs)
+
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyPanel_OnInternalIdle(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kw):
+        return PyPanel.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyPanel.DoMoveWindow instead.")
+
+    def base_DoSetSize(*args, **kw):
+        return PyPanel.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyPanel.DoSetSize instead.")
+
+    def base_DoSetClientSize(*args, **kw):
+        return PyPanel.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyPanel.DoSetClientSize instead.")
+
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyPanel.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyPanel.DoSetVirtualSize instead.")
+
+    def base_DoGetSize(*args, **kw):
+        return PyPanel.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyPanel.DoGetSize instead.")
+
+    def base_DoGetClientSize(*args, **kw):
+        return PyPanel.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyPanel.DoGetClientSize instead.")
+
+    def base_DoGetPosition(*args, **kw):
+        return PyPanel.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyPanel.DoGetPosition instead.")
+
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyPanel.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyPanel.DoGetVirtualSize instead.")
+
+    def base_DoGetBestSize(*args, **kw):
+        return PyPanel.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyPanel.DoGetBestSize instead.")
+
+    def base_InitDialog(*args, **kw):
+        return PyPanel.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyPanel.InitDialog instead.")
+
+    def base_TransferDataToWindow(*args, **kw):
+        return PyPanel.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyPanel.TransferDataToWindow instead.")
+
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyPanel.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyPanel.TransferDataFromWindow instead.")
+
+    def base_Validate(*args, **kw):
+        return PyPanel.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyPanel.Validate instead.")
+
+    def base_AcceptsFocus(*args, **kw):
+        return PyPanel.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyPanel.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyPanel.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyPanel.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyPanel.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyPanel.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyPanel.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyPanel.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyPanel.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyPanel.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyPanel.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyPanel.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyPanel.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyPanel.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyPanel.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyPanel.OnInternalIdle instead.")
+
+PyPanel_swigregister = _windows_.PyPanel_swigregister
+PyPanel_swigregister(PyPanel)
 
 def PrePyPanel(*args, **kwargs):
     """PrePyPanel() -> PyPanel"""
     val = _windows_.new_PrePyPanel(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class PyScrolledWindow(ScrolledWindow):
     """Proxy of C++ PyScrolledWindow class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyScrolledWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, Window parent, int id=-1, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow
         """
-        newobj = _windows_.new_PyScrolledWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
+        _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs))
+        self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -3718,102 +3477,165 @@ class PyScrolledWindow(ScrolledWindow):
         """SetBestSize(self, Size size)"""
         return _windows_.PyScrolledWindow_SetBestSize(*args, **kwargs)
 
-    def base_DoMoveWindow(*args, **kwargs):
-        """base_DoMoveWindow(self, int x, int y, int width, int height)"""
-        return _windows_.PyScrolledWindow_base_DoMoveWindow(*args, **kwargs)
-
-    def base_DoSetSize(*args, **kwargs):
-        """base_DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
-        return _windows_.PyScrolledWindow_base_DoSetSize(*args, **kwargs)
-
-    def base_DoSetClientSize(*args, **kwargs):
-        """base_DoSetClientSize(self, int width, int height)"""
-        return _windows_.PyScrolledWindow_base_DoSetClientSize(*args, **kwargs)
-
-    def base_DoSetVirtualSize(*args, **kwargs):
-        """base_DoSetVirtualSize(self, int x, int y)"""
-        return _windows_.PyScrolledWindow_base_DoSetVirtualSize(*args, **kwargs)
-
-    def base_DoGetSize(*args, **kwargs):
-        """base_DoGetSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetSize(*args, **kwargs)
-
-    def base_DoGetClientSize(*args, **kwargs):
-        """base_DoGetClientSize() -> (width, height)"""
-        return _windows_.PyScrolledWindow_base_DoGetClientSize(*args, **kwargs)
-
-    def base_DoGetPosition(*args, **kwargs):
-        """base_DoGetPosition() -> (x,y)"""
-        return _windows_.PyScrolledWindow_base_DoGetPosition(*args, **kwargs)
-
-    def base_DoGetVirtualSize(*args, **kwargs):
-        """base_DoGetVirtualSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_DoGetVirtualSize(*args, **kwargs)
-
-    def base_DoGetBestSize(*args, **kwargs):
-        """base_DoGetBestSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_DoGetBestSize(*args, **kwargs)
-
-    def base_InitDialog(*args, **kwargs):
-        """base_InitDialog(self)"""
-        return _windows_.PyScrolledWindow_base_InitDialog(*args, **kwargs)
-
-    def base_TransferDataToWindow(*args, **kwargs):
-        """base_TransferDataToWindow(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_TransferDataToWindow(*args, **kwargs)
-
-    def base_TransferDataFromWindow(*args, **kwargs):
-        """base_TransferDataFromWindow(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_TransferDataFromWindow(*args, **kwargs)
-
-    def base_Validate(*args, **kwargs):
-        """base_Validate(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_Validate(*args, **kwargs)
-
-    def base_AcceptsFocus(*args, **kwargs):
-        """base_AcceptsFocus(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_AcceptsFocus(*args, **kwargs)
-
-    def base_AcceptsFocusFromKeyboard(*args, **kwargs):
-        """base_AcceptsFocusFromKeyboard(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_AcceptsFocusFromKeyboard(*args, **kwargs)
-
-    def base_GetMaxSize(*args, **kwargs):
-        """base_GetMaxSize(self) -> Size"""
-        return _windows_.PyScrolledWindow_base_GetMaxSize(*args, **kwargs)
-
-    def base_AddChild(*args, **kwargs):
-        """base_AddChild(self, Window child)"""
-        return _windows_.PyScrolledWindow_base_AddChild(*args, **kwargs)
-
-    def base_RemoveChild(*args, **kwargs):
-        """base_RemoveChild(self, Window child)"""
-        return _windows_.PyScrolledWindow_base_RemoveChild(*args, **kwargs)
-
-    def base_ShouldInheritColours(*args, **kwargs):
-        """base_ShouldInheritColours(self) -> bool"""
-        return _windows_.PyScrolledWindow_base_ShouldInheritColours(*args, **kwargs)
-
-    def base_ApplyParentThemeBackground(*args, **kwargs):
-        """base_ApplyParentThemeBackground(self, Colour c)"""
-        return _windows_.PyScrolledWindow_base_ApplyParentThemeBackground(*args, **kwargs)
-
-    def base_GetDefaultAttributes(*args, **kwargs):
-        """base_GetDefaultAttributes(self) -> VisualAttributes"""
-        return _windows_.PyScrolledWindow_base_GetDefaultAttributes(*args, **kwargs)
-
-
-class PyScrolledWindowPtr(PyScrolledWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyScrolledWindow
-_windows_.PyScrolledWindow_swigregister(PyScrolledWindowPtr)
+    def DoEraseBackground(*args, **kwargs):
+        """DoEraseBackground(self, DC dc) -> bool"""
+        return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs)
+
+    def DoMoveWindow(*args, **kwargs):
+        """DoMoveWindow(self, int x, int y, int width, int height)"""
+        return _windows_.PyScrolledWindow_DoMoveWindow(*args, **kwargs)
+
+    def DoSetSize(*args, **kwargs):
+        """DoSetSize(self, int x, int y, int width, int height, int sizeFlags=SIZE_AUTO)"""
+        return _windows_.PyScrolledWindow_DoSetSize(*args, **kwargs)
+
+    def DoSetClientSize(*args, **kwargs):
+        """DoSetClientSize(self, int width, int height)"""
+        return _windows_.PyScrolledWindow_DoSetClientSize(*args, **kwargs)
+
+    def DoSetVirtualSize(*args, **kwargs):
+        """DoSetVirtualSize(self, int x, int y)"""
+        return _windows_.PyScrolledWindow_DoSetVirtualSize(*args, **kwargs)
+
+    def DoGetSize(*args, **kwargs):
+        """DoGetSize() -> (width, height)"""
+        return _windows_.PyScrolledWindow_DoGetSize(*args, **kwargs)
+
+    def DoGetClientSize(*args, **kwargs):
+        """DoGetClientSize() -> (width, height)"""
+        return _windows_.PyScrolledWindow_DoGetClientSize(*args, **kwargs)
+
+    def DoGetPosition(*args, **kwargs):
+        """DoGetPosition() -> (x,y)"""
+        return _windows_.PyScrolledWindow_DoGetPosition(*args, **kwargs)
+
+    def DoGetVirtualSize(*args, **kwargs):
+        """DoGetVirtualSize(self) -> Size"""
+        return _windows_.PyScrolledWindow_DoGetVirtualSize(*args, **kwargs)
+
+    def DoGetBestSize(*args, **kwargs):
+        """DoGetBestSize(self) -> Size"""
+        return _windows_.PyScrolledWindow_DoGetBestSize(*args, **kwargs)
+
+    def GetDefaultAttributes(*args, **kwargs):
+        """GetDefaultAttributes(self) -> VisualAttributes"""
+        return _windows_.PyScrolledWindow_GetDefaultAttributes(*args, **kwargs)
+
+    def OnInternalIdle(*args, **kwargs):
+        """OnInternalIdle(self)"""
+        return _windows_.PyScrolledWindow_OnInternalIdle(*args, **kwargs)
+
+    def base_DoMoveWindow(*args, **kw):
+        return PyScrolledWindow.DoMoveWindow(*args, **kw)
+    base_DoMoveWindow = wx._deprecated(base_DoMoveWindow,
+                                   "Please use PyScrolledWindow.DoMoveWindow instead.")
+
+    def base_DoSetSize(*args, **kw):
+        return PyScrolledWindow.DoSetSize(*args, **kw)
+    base_DoSetSize = wx._deprecated(base_DoSetSize,
+                                   "Please use PyScrolledWindow.DoSetSize instead.")
+
+    def base_DoSetClientSize(*args, **kw):
+        return PyScrolledWindow.DoSetClientSize(*args, **kw)
+    base_DoSetClientSize = wx._deprecated(base_DoSetClientSize,
+                                   "Please use PyScrolledWindow.DoSetClientSize instead.")
+
+    def base_DoSetVirtualSize(*args, **kw):
+        return PyScrolledWindow.DoSetVirtualSize(*args, **kw)
+    base_DoSetVirtualSize = wx._deprecated(base_DoSetVirtualSize,
+                                   "Please use PyScrolledWindow.DoSetVirtualSize instead.")
+
+    def base_DoGetSize(*args, **kw):
+        return PyScrolledWindow.DoGetSize(*args, **kw)
+    base_DoGetSize = wx._deprecated(base_DoGetSize,
+                                   "Please use PyScrolledWindow.DoGetSize instead.")
+
+    def base_DoGetClientSize(*args, **kw):
+        return PyScrolledWindow.DoGetClientSize(*args, **kw)
+    base_DoGetClientSize = wx._deprecated(base_DoGetClientSize,
+                                   "Please use PyScrolledWindow.DoGetClientSize instead.")
+
+    def base_DoGetPosition(*args, **kw):
+        return PyScrolledWindow.DoGetPosition(*args, **kw)
+    base_DoGetPosition = wx._deprecated(base_DoGetPosition,
+                                   "Please use PyScrolledWindow.DoGetPosition instead.")
+
+    def base_DoGetVirtualSize(*args, **kw):
+        return PyScrolledWindow.DoGetVirtualSize(*args, **kw)
+    base_DoGetVirtualSize = wx._deprecated(base_DoGetVirtualSize,
+                                   "Please use PyScrolledWindow.DoGetVirtualSize instead.")
+
+    def base_DoGetBestSize(*args, **kw):
+        return PyScrolledWindow.DoGetBestSize(*args, **kw)
+    base_DoGetBestSize = wx._deprecated(base_DoGetBestSize,
+                                   "Please use PyScrolledWindow.DoGetBestSize instead.")
+
+    def base_InitDialog(*args, **kw):
+        return PyScrolledWindow.InitDialog(*args, **kw)
+    base_InitDialog = wx._deprecated(base_InitDialog,
+                                   "Please use PyScrolledWindow.InitDialog instead.")
+
+    def base_TransferDataToWindow(*args, **kw):
+        return PyScrolledWindow.TransferDataToWindow(*args, **kw)
+    base_TransferDataToWindow = wx._deprecated(base_TransferDataToWindow,
+                                   "Please use PyScrolledWindow.TransferDataToWindow instead.")
+
+    def base_TransferDataFromWindow(*args, **kw):
+        return PyScrolledWindow.TransferDataFromWindow(*args, **kw)
+    base_TransferDataFromWindow = wx._deprecated(base_TransferDataFromWindow,
+                                   "Please use PyScrolledWindow.TransferDataFromWindow instead.")
+
+    def base_Validate(*args, **kw):
+        return PyScrolledWindow.Validate(*args, **kw)
+    base_Validate = wx._deprecated(base_Validate,
+                                   "Please use PyScrolledWindow.Validate instead.")
+
+    def base_AcceptsFocus(*args, **kw):
+        return PyScrolledWindow.AcceptsFocus(*args, **kw)
+    base_AcceptsFocus = wx._deprecated(base_AcceptsFocus,
+                                   "Please use PyScrolledWindow.AcceptsFocus instead.")
+
+    def base_AcceptsFocusFromKeyboard(*args, **kw):
+        return PyScrolledWindow.AcceptsFocusFromKeyboard(*args, **kw)
+    base_AcceptsFocusFromKeyboard = wx._deprecated(base_AcceptsFocusFromKeyboard,
+                                   "Please use PyScrolledWindow.AcceptsFocusFromKeyboard instead.")
+
+    def base_GetMaxSize(*args, **kw):
+        return PyScrolledWindow.GetMaxSize(*args, **kw)
+    base_GetMaxSize = wx._deprecated(base_GetMaxSize,
+                                   "Please use PyScrolledWindow.GetMaxSize instead.")
+
+    def base_AddChild(*args, **kw):
+        return PyScrolledWindow.AddChild(*args, **kw)
+    base_AddChild = wx._deprecated(base_AddChild,
+                                   "Please use PyScrolledWindow.AddChild instead.")
+
+    def base_RemoveChild(*args, **kw):
+        return PyScrolledWindow.RemoveChild(*args, **kw)
+    base_RemoveChild = wx._deprecated(base_RemoveChild,
+                                   "Please use PyScrolledWindow.RemoveChild instead.")
+
+    def base_ShouldInheritColours(*args, **kw):
+        return PyScrolledWindow.ShouldInheritColours(*args, **kw)
+    base_ShouldInheritColours = wx._deprecated(base_ShouldInheritColours,
+                                   "Please use PyScrolledWindow.ShouldInheritColours instead.")
+
+    def base_GetDefaultAttributes(*args, **kw):
+        return PyScrolledWindow.GetDefaultAttributes(*args, **kw)
+    base_GetDefaultAttributes = wx._deprecated(base_GetDefaultAttributes,
+                                   "Please use PyScrolledWindow.GetDefaultAttributes instead.")
+
+    def base_OnInternalIdle(*args, **kw):
+        return PyScrolledWindow.OnInternalIdle(*args, **kw)
+    base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
+                                   "Please use PyScrolledWindow.OnInternalIdle instead.")
+
+PyScrolledWindow_swigregister = _windows_.PyScrolledWindow_swigregister
+PyScrolledWindow_swigregister(PyScrolledWindow)
 
 def PrePyScrolledWindow(*args, **kwargs):
     """PrePyScrolledWindow() -> PyScrolledWindow"""
     val = _windows_.new_PrePyScrolledWindow(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
@@ -3840,23 +3662,16 @@ PRINTBIN_FORMSOURCE = _windows_.PRINTBIN_FORMSOURCE
 PRINTBIN_USER = _windows_.PRINTBIN_USER
 class PrintData(_core.Object):
     """Proxy of C++ PrintData class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
         """
         __init__(self) -> PrintData
         __init__(self, PrintData data) -> PrintData
         """
-        newobj = _windows_.new_PrintData(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_PrintData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.PrintData_swiginit(self,_windows_.new_PrintData(*args))
+    __swig_destroy__ = _windows_.delete_PrintData
+    __del__ = lambda self : None;
     def GetNoCopies(*args, **kwargs):
         """GetNoCopies(self) -> int"""
         return _windows_.PrintData_GetNoCopies(*args, **kwargs)
@@ -3958,107 +3773,32 @@ class PrintData(_core.Object):
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
-    def GetPrinterCommand(*args, **kwargs):
-        """GetPrinterCommand(self) -> String"""
-        return _windows_.PrintData_GetPrinterCommand(*args, **kwargs)
-
-    def GetPrinterOptions(*args, **kwargs):
-        """GetPrinterOptions(self) -> String"""
-        return _windows_.PrintData_GetPrinterOptions(*args, **kwargs)
-
-    def GetPreviewCommand(*args, **kwargs):
-        """GetPreviewCommand(self) -> String"""
-        return _windows_.PrintData_GetPreviewCommand(*args, **kwargs)
-
-    def GetFontMetricPath(*args, **kwargs):
-        """GetFontMetricPath(self) -> String"""
-        return _windows_.PrintData_GetFontMetricPath(*args, **kwargs)
-
-    def GetPrinterScaleX(*args, **kwargs):
-        """GetPrinterScaleX(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleX(*args, **kwargs)
-
-    def GetPrinterScaleY(*args, **kwargs):
-        """GetPrinterScaleY(self) -> double"""
-        return _windows_.PrintData_GetPrinterScaleY(*args, **kwargs)
-
-    def GetPrinterTranslateX(*args, **kwargs):
-        """GetPrinterTranslateX(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateX(*args, **kwargs)
-
-    def GetPrinterTranslateY(*args, **kwargs):
-        """GetPrinterTranslateY(self) -> long"""
-        return _windows_.PrintData_GetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterCommand(*args, **kwargs):
-        """SetPrinterCommand(self, String command)"""
-        return _windows_.PrintData_SetPrinterCommand(*args, **kwargs)
-
-    def SetPrinterOptions(*args, **kwargs):
-        """SetPrinterOptions(self, String options)"""
-        return _windows_.PrintData_SetPrinterOptions(*args, **kwargs)
+    def GetPrivData(*args, **kwargs):
+        """GetPrivData(self) -> PyObject"""
+        return _windows_.PrintData_GetPrivData(*args, **kwargs)
 
-    def SetPreviewCommand(*args, **kwargs):
-        """SetPreviewCommand(self, String command)"""
-        return _windows_.PrintData_SetPreviewCommand(*args, **kwargs)
+    def SetPrivData(*args, **kwargs):
+        """SetPrivData(self, PyObject data)"""
+        return _windows_.PrintData_SetPrivData(*args, **kwargs)
 
-    def SetFontMetricPath(*args, **kwargs):
-        """SetFontMetricPath(self, String path)"""
-        return _windows_.PrintData_SetFontMetricPath(*args, **kwargs)
-
-    def SetPrinterScaleX(*args, **kwargs):
-        """SetPrinterScaleX(self, double x)"""
-        return _windows_.PrintData_SetPrinterScaleX(*args, **kwargs)
-
-    def SetPrinterScaleY(*args, **kwargs):
-        """SetPrinterScaleY(self, double y)"""
-        return _windows_.PrintData_SetPrinterScaleY(*args, **kwargs)
-
-    def SetPrinterScaling(*args, **kwargs):
-        """SetPrinterScaling(self, double x, double y)"""
-        return _windows_.PrintData_SetPrinterScaling(*args, **kwargs)
-
-    def SetPrinterTranslateX(*args, **kwargs):
-        """SetPrinterTranslateX(self, long x)"""
-        return _windows_.PrintData_SetPrinterTranslateX(*args, **kwargs)
-
-    def SetPrinterTranslateY(*args, **kwargs):
-        """SetPrinterTranslateY(self, long y)"""
-        return _windows_.PrintData_SetPrinterTranslateY(*args, **kwargs)
-
-    def SetPrinterTranslation(*args, **kwargs):
-        """SetPrinterTranslation(self, long x, long y)"""
-        return _windows_.PrintData_SetPrinterTranslation(*args, **kwargs)
-
-
-class PrintDataPtr(PrintData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PrintData
-_windows_.PrintData_swigregister(PrintDataPtr)
+PrintData_swigregister = _windows_.PrintData_swigregister
+PrintData_swigregister(PrintData)
 PrintoutTitleStr = cvar.PrintoutTitleStr
 PreviewCanvasNameStr = cvar.PreviewCanvasNameStr
 
 class PageSetupDialogData(_core.Object):
     """Proxy of C++ PageSetupDialogData class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPageSetupDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
         """
         __init__(self) -> PageSetupDialogData
         __init__(self, PageSetupDialogData data) -> PageSetupDialogData
+        __init__(self, PrintData data) -> PageSetupDialogData
         """
-        newobj = _windows_.new_PageSetupDialogData(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_PageSetupDialogData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.PageSetupDialogData_swiginit(self,_windows_.new_PageSetupDialogData(*args))
+    __swig_destroy__ = _windows_.delete_PageSetupDialogData
+    __del__ = lambda self : None;
     def EnableHelp(*args, **kwargs):
         """EnableHelp(self, bool flag)"""
         return _windows_.PageSetupDialogData_EnableHelp(*args, **kwargs)
@@ -4175,25 +3915,25 @@ class PageSetupDialogData(_core.Object):
         """SetPrintData(self, PrintData printData)"""
         return _windows_.PageSetupDialogData_SetPrintData(*args, **kwargs)
 
-    def __nonzero__(self): return self.Ok() 
+    def CalculateIdFromPaperSize(*args, **kwargs):
+        """CalculateIdFromPaperSize(self)"""
+        return _windows_.PageSetupDialogData_CalculateIdFromPaperSize(*args, **kwargs)
 
-class PageSetupDialogDataPtr(PageSetupDialogData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PageSetupDialogData
-_windows_.PageSetupDialogData_swigregister(PageSetupDialogDataPtr)
+    def CalculatePaperSizeFromId(*args, **kwargs):
+        """CalculatePaperSizeFromId(self)"""
+        return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs)
+
+    def __nonzero__(self): return self.Ok() 
+PageSetupDialogData_swigregister = _windows_.PageSetupDialogData_swigregister
+PageSetupDialogData_swigregister(PageSetupDialogData)
 
 class PageSetupDialog(_core.Object):
     """Proxy of C++ PageSetupDialog class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPageSetupDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, PageSetupDialogData data=None) -> PageSetupDialog"""
-        newobj = _windows_.new_PageSetupDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PageSetupDialog_swiginit(self,_windows_.new_PageSetupDialog(*args, **kwargs))
     def GetPageSetupData(*args, **kwargs):
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _windows_.PageSetupDialog_GetPageSetupData(*args, **kwargs)
@@ -4206,33 +3946,22 @@ class PageSetupDialog(_core.Object):
         """ShowModal(self) -> int"""
         return _windows_.PageSetupDialog_ShowModal(*args, **kwargs)
 
-
-class PageSetupDialogPtr(PageSetupDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PageSetupDialog
-_windows_.PageSetupDialog_swigregister(PageSetupDialogPtr)
+PageSetupDialog_swigregister = _windows_.PageSetupDialog_swigregister
+PageSetupDialog_swigregister(PageSetupDialog)
 
 class PrintDialogData(_core.Object):
     """Proxy of C++ PrintDialogData class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
         """
         __init__(self) -> PrintDialogData
         __init__(self, PrintData printData) -> PrintDialogData
+        __init__(self, PrintDialogData printData) -> PrintDialogData
         """
-        newobj = _windows_.new_PrintDialogData(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_PrintDialogData):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.PrintDialogData_swiginit(self,_windows_.new_PrintDialogData(*args))
+    __swig_destroy__ = _windows_.delete_PrintDialogData
+    __del__ = lambda self : None;
     def GetFromPage(*args, **kwargs):
         """GetFromPage(self) -> int"""
         return _windows_.PrintDialogData_GetFromPage(*args, **kwargs)
@@ -4269,14 +3998,6 @@ class PrintDialogData(_core.Object):
         """GetPrintToFile(self) -> bool"""
         return _windows_.PrintDialogData_GetPrintToFile(*args, **kwargs)
 
-    def GetSetupDialog(*args, **kwargs):
-        """GetSetupDialog(self) -> bool"""
-        return _windows_.PrintDialogData_GetSetupDialog(*args, **kwargs)
-
-    def SetSetupDialog(*args, **kwargs):
-        """SetSetupDialog(self, bool flag)"""
-        return _windows_.PrintDialogData_SetSetupDialog(*args, **kwargs)
-
     def SetFromPage(*args, **kwargs):
         """SetFromPage(self, int v)"""
         return _windows_.PrintDialogData_SetFromPage(*args, **kwargs)
@@ -4358,24 +4079,16 @@ class PrintDialogData(_core.Object):
         return _windows_.PrintDialogData_SetPrintData(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
-
-class PrintDialogDataPtr(PrintDialogData):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PrintDialogData
-_windows_.PrintDialogData_swigregister(PrintDialogDataPtr)
+PrintDialogData_swigregister = _windows_.PrintDialogData_swigregister
+PrintDialogData_swigregister(PrintDialogData)
 
 class PrintDialog(_core.Object):
     """Proxy of C++ PrintDialog class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintDialog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, PrintDialogData data=None) -> PrintDialog"""
-        newobj = _windows_.new_PrintDialog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PrintDialog_swiginit(self,_windows_.new_PrintDialog(*args, **kwargs))
     def ShowModal(*args, **kwargs):
         """ShowModal(self) -> int"""
         return _windows_.PrintDialog_ShowModal(*args, **kwargs)
@@ -4392,33 +4105,21 @@ class PrintDialog(_core.Object):
         """GetPrintDC(self) -> DC"""
         return _windows_.PrintDialog_GetPrintDC(*args, **kwargs)
 
-
-class PrintDialogPtr(PrintDialog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PrintDialog
-_windows_.PrintDialog_swigregister(PrintDialogPtr)
+PrintDialog_swigregister = _windows_.PrintDialog_swigregister
+PrintDialog_swigregister(PrintDialog)
 
 PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR
 PRINTER_CANCELLED = _windows_.PRINTER_CANCELLED
 PRINTER_ERROR = _windows_.PRINTER_ERROR
 class Printer(_core.Object):
     """Proxy of C++ Printer class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrinter instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, PrintDialogData data=None) -> Printer"""
-        newobj = _windows_.new_Printer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_windows_.delete_Printer):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _windows_.Printer_swiginit(self,_windows_.new_Printer(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_Printer
+    __del__ = lambda self : None;
     def CreateAbortWindow(*args, **kwargs):
         """CreateAbortWindow(self, Window parent, Printout printout) -> Window"""
         return _windows_.Printer_CreateAbortWindow(*args, **kwargs)
@@ -4452,30 +4153,24 @@ class Printer(_core.Object):
         return _windows_.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)
+Printer_swigregister = _windows_.Printer_swigregister
+Printer_swigregister(Printer)
 
-class PrinterPtr(Printer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Printer
-_windows_.Printer_swigregister(PrinterPtr)
-
-def Printer_GetLastError(*args, **kwargs):
-    """Printer_GetLastError() -> int"""
-    return _windows_.Printer_GetLastError(*args, **kwargs)
+def Printer_GetLastError(*args):
+  """Printer_GetLastError() -> int"""
+  return _windows_.Printer_GetLastError(*args)
 
 class Printout(_core.Object):
     """Proxy of C++ Printout class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPrintout instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """__init__(self, String title=PrintoutTitleStr) -> Printout"""
-        newobj = _windows_.new_Printout(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.Printout_swiginit(self,_windows_.new_Printout(*args, **kwargs))
         self._setCallbackInfo(self, Printout)
 
+    __swig_destroy__ = _windows_.delete_Printout
+    __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.Printout__setCallbackInfo(*args, **kwargs)
@@ -4532,80 +4227,94 @@ class Printout(_core.Object):
         """SetIsPreview(self, bool p)"""
         return _windows_.Printout_SetIsPreview(*args, **kwargs)
 
-    def base_OnBeginDocument(*args, **kwargs):
-        """base_OnBeginDocument(self, int startPage, int endPage) -> bool"""
-        return _windows_.Printout_base_OnBeginDocument(*args, **kwargs)
+    def OnBeginDocument(*args, **kwargs):
+        """OnBeginDocument(self, int startPage, int endPage) -> bool"""
+        return _windows_.Printout_OnBeginDocument(*args, **kwargs)
+
+    def OnEndDocument(*args, **kwargs):
+        """OnEndDocument(self)"""
+        return _windows_.Printout_OnEndDocument(*args, **kwargs)
 
-    def base_OnEndDocument(*args, **kwargs):
-        """base_OnEndDocument(self)"""
-        return _windows_.Printout_base_OnEndDocument(*args, **kwargs)
+    def OnBeginPrinting(*args, **kwargs):
+        """OnBeginPrinting(self)"""
+        return _windows_.Printout_OnBeginPrinting(*args, **kwargs)
 
-    def base_OnBeginPrinting(*args, **kwargs):
-        """base_OnBeginPrinting(self)"""
-        return _windows_.Printout_base_OnBeginPrinting(*args, **kwargs)
+    def OnEndPrinting(*args, **kwargs):
+        """OnEndPrinting(self)"""
+        return _windows_.Printout_OnEndPrinting(*args, **kwargs)
 
-    def base_OnEndPrinting(*args, **kwargs):
-        """base_OnEndPrinting(self)"""
-        return _windows_.Printout_base_OnEndPrinting(*args, **kwargs)
+    def OnPreparePrinting(*args, **kwargs):
+        """OnPreparePrinting(self)"""
+        return _windows_.Printout_OnPreparePrinting(*args, **kwargs)
 
-    def base_OnPreparePrinting(*args, **kwargs):
-        """base_OnPreparePrinting(self)"""
-        return _windows_.Printout_base_OnPreparePrinting(*args, **kwargs)
+    def HasPage(*args, **kwargs):
+        """HasPage(self, int page) -> bool"""
+        return _windows_.Printout_HasPage(*args, **kwargs)
 
-    def base_HasPage(*args, **kwargs):
-        """base_HasPage(self, int page) -> bool"""
-        return _windows_.Printout_base_HasPage(*args, **kwargs)
+    def GetPageInfo(*args, **kwargs):
+        """GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
+        return _windows_.Printout_GetPageInfo(*args, **kwargs)
 
-    def base_GetPageInfo(*args, **kwargs):
-        """base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)"""
-        return _windows_.Printout_base_GetPageInfo(*args, **kwargs)
+    def base_OnBeginDocument(*args, **kw):
+        return Printout.OnBeginDocument(*args, **kw)
+    base_OnBeginDocument = wx._deprecated(base_OnBeginDocument,
+                                   "Please use Printout.OnBeginDocument instead.")
 
+    def base_OnEndDocument(*args, **kw):
+        return Printout.OnEndDocument(*args, **kw)
+    base_OnEndDocument = wx._deprecated(base_OnEndDocument,
+                                   "Please use Printout.OnEndDocument instead.")
 
-class PrintoutPtr(Printout):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Printout
-_windows_.Printout_swigregister(PrintoutPtr)
+    def base_OnBeginPrinting(*args, **kw):
+        return Printout.OnBeginPrinting(*args, **kw)
+    base_OnBeginPrinting = wx._deprecated(base_OnBeginPrinting,
+                                   "Please use Printout.OnBeginPrinting instead.")
+
+    def base_OnEndPrinting(*args, **kw):
+        return Printout.OnEndPrinting(*args, **kw)
+    base_OnEndPrinting = wx._deprecated(base_OnEndPrinting,
+                                   "Please use Printout.OnEndPrinting instead.")
+
+    def base_OnPreparePrinting(*args, **kw):
+        return Printout.OnPreparePrinting(*args, **kw)
+    base_OnPreparePrinting = wx._deprecated(base_OnPreparePrinting,
+                                   "Please use Printout.OnPreparePrinting instead.")
+
+    def base_GetPageInfo(*args, **kw):
+        return Printout.GetPageInfo(*args, **kw)
+    base_GetPageInfo = wx._deprecated(base_GetPageInfo,
+                                   "Please use Printout.GetPageInfo instead.")
+
+Printout_swigregister = _windows_.Printout_swigregister
+Printout_swigregister(Printout)
 
 class PreviewCanvas(ScrolledWindow):
     """Proxy of C++ PreviewCanvas class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewCanvas instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, PrintPreview preview, Window parent, Point pos=DefaultPosition, 
             Size size=DefaultSize, long style=0, 
             String name=PreviewCanvasNameStr) -> PreviewCanvas
         """
-        newobj = _windows_.new_PreviewCanvas(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PreviewCanvas_swiginit(self,_windows_.new_PreviewCanvas(*args, **kwargs))
         self._setOORInfo(self)
 
-
-class PreviewCanvasPtr(PreviewCanvas):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PreviewCanvas
-_windows_.PreviewCanvas_swigregister(PreviewCanvasPtr)
+PreviewCanvas_swigregister = _windows_.PreviewCanvas_swigregister
+PreviewCanvas_swigregister(PreviewCanvas)
 
 class PreviewFrame(Frame):
     """Proxy of C++ PreviewFrame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
             Size size=DefaultSize, 
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PreviewFrame
         """
-        newobj = _windows_.new_PreviewFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PreviewFrame_swiginit(self,_windows_.new_PreviewFrame(*args, **kwargs))
         self._setOORInfo(self)
 
     def Initialize(*args, **kwargs):
@@ -4624,13 +4333,8 @@ class PreviewFrame(Frame):
         """GetControlBar(self) -> PreviewControlBar"""
         return _windows_.PreviewFrame_GetControlBar(*args, **kwargs)
 
-
-class PreviewFramePtr(PreviewFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PreviewFrame
-_windows_.PreviewFrame_swigregister(PreviewFramePtr)
+PreviewFrame_swigregister = _windows_.PreviewFrame_swigregister
+PreviewFrame_swigregister(PreviewFrame)
 
 PREVIEW_PRINT = _windows_.PREVIEW_PRINT
 PREVIEW_PREVIOUS = _windows_.PREVIEW_PREVIOUS
@@ -4650,18 +4354,15 @@ ID_PREVIEW_LAST = _windows_.ID_PREVIEW_LAST
 ID_PREVIEW_GOTO = _windows_.ID_PREVIEW_GOTO
 class PreviewControlBar(Panel):
     """Proxy of C++ PreviewControlBar class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=TAB_TRAVERSAL, String name=PanelNameStr) -> PreviewControlBar
         """
-        newobj = _windows_.new_PreviewControlBar(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PreviewControlBar_swiginit(self,_windows_.new_PreviewControlBar(*args, **kwargs))
         self._setOORInfo(self)
 
     def GetZoomControl(*args, **kwargs):
@@ -4696,27 +4397,21 @@ class PreviewControlBar(Panel):
         """OnGoto(self)"""
         return _windows_.PreviewControlBar_OnGoto(*args, **kwargs)
 
-
-class PreviewControlBarPtr(PreviewControlBar):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PreviewControlBar
-_windows_.PreviewControlBar_swigregister(PreviewControlBarPtr)
+PreviewControlBar_swigregister = _windows_.PreviewControlBar_swigregister
+PreviewControlBar_swigregister(PreviewControlBar)
 
 class PrintPreview(_core.Object):
     """Proxy of C++ PrintPreview class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
         """
-        newobj = _windows_.new_PrintPreview(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PrintPreview_swiginit(self,_windows_.new_PrintPreview(*args))
+    __swig_destroy__ = _windows_.delete_PrintPreview
+    __del__ = lambda self : None;
     def SetCurrentPage(*args, **kwargs):
         """SetCurrentPage(self, int pageNum) -> bool"""
         return _windows_.PrintPreview_SetCurrentPage(*args, **kwargs)
@@ -4806,83 +4501,74 @@ class PrintPreview(_core.Object):
         return _windows_.PrintPreview_DetermineScaling(*args, **kwargs)
 
     def __nonzero__(self): return self.Ok() 
-
-class PrintPreviewPtr(PrintPreview):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PrintPreview
-_windows_.PrintPreview_swigregister(PrintPreviewPtr)
+PrintPreview_swigregister = _windows_.PrintPreview_swigregister
+PrintPreview_swigregister(PrintPreview)
 
 class PyPrintPreview(PrintPreview):
     """Proxy of C++ PyPrintPreview class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args): 
         """
         __init__(self, Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
-        newobj = _windows_.new_PyPrintPreview(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PyPrintPreview_swiginit(self,_windows_.new_PyPrintPreview(*args))
         self._setCallbackInfo(self, PyPrintPreview)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPrintPreview__setCallbackInfo(*args, **kwargs)
 
-    def base_SetCurrentPage(*args, **kwargs):
-        """base_SetCurrentPage(self, int pageNum) -> bool"""
-        return _windows_.PyPrintPreview_base_SetCurrentPage(*args, **kwargs)
-
-    def base_PaintPage(*args, **kwargs):
-        """base_PaintPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_PaintPage(*args, **kwargs)
+    def base_SetCurrentPage(*args, **kw):
+        return PyPrintPreview.SetCurrentPage(*args, **kw)
+    base_SetCurrentPage = wx._deprecated(base_SetCurrentPage,
+                                   "Please use PyPrintPreview.SetCurrentPage instead.")
 
-    def base_DrawBlankPage(*args, **kwargs):
-        """base_DrawBlankPage(self, PreviewCanvas canvas, DC dc) -> bool"""
-        return _windows_.PyPrintPreview_base_DrawBlankPage(*args, **kwargs)
+    def base_PaintPage(*args, **kw):
+        return PyPrintPreview.PaintPage(*args, **kw)
+    base_PaintPage = wx._deprecated(base_PaintPage,
+                                   "Please use PyPrintPreview.PaintPage instead.")
 
-    def base_RenderPage(*args, **kwargs):
-        """base_RenderPage(self, int pageNum) -> bool"""
-        return _windows_.PyPrintPreview_base_RenderPage(*args, **kwargs)
+    def base_DrawBlankPage(*args, **kw):
+        return PyPrintPreview.DrawBlankPage(*args, **kw)
+    base_DrawBlankPage = wx._deprecated(base_DrawBlankPage,
+                                   "Please use PyPrintPreview.DrawBlankPage instead.")
 
-    def base_SetZoom(*args, **kwargs):
-        """base_SetZoom(self, int percent)"""
-        return _windows_.PyPrintPreview_base_SetZoom(*args, **kwargs)
+    def base_RenderPage(*args, **kw):
+        return PyPrintPreview.RenderPage(*args, **kw)
+    base_RenderPage = wx._deprecated(base_RenderPage,
+                                   "Please use PyPrintPreview.RenderPage instead.")
 
-    def base_Print(*args, **kwargs):
-        """base_Print(self, bool interactive) -> bool"""
-        return _windows_.PyPrintPreview_base_Print(*args, **kwargs)
+    def base_SetZoom(*args, **kw):
+        return PyPrintPreview.SetZoom(*args, **kw)
+    base_SetZoom = wx._deprecated(base_SetZoom,
+                                   "Please use PyPrintPreview.SetZoom instead.")
 
-    def base_DetermineScaling(*args, **kwargs):
-        """base_DetermineScaling(self)"""
-        return _windows_.PyPrintPreview_base_DetermineScaling(*args, **kwargs)
+    def base_Print(*args, **kw):
+        return PyPrintPreview.Print(*args, **kw)
+    base_Print = wx._deprecated(base_Print,
+                                   "Please use PyPrintPreview.Print instead.")
 
+    def base_DetermineScaling(*args, **kw):
+        return PyPrintPreview.DetermineScaling(*args, **kw)
+    base_DetermineScaling = wx._deprecated(base_DetermineScaling,
+                                   "Please use PyPrintPreview.DetermineScaling instead.")
 
-class PyPrintPreviewPtr(PyPrintPreview):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyPrintPreview
-_windows_.PyPrintPreview_swigregister(PyPrintPreviewPtr)
+PyPrintPreview_swigregister = _windows_.PyPrintPreview_swigregister
+PyPrintPreview_swigregister(PyPrintPreview)
 
 class PyPreviewFrame(PreviewFrame):
     """Proxy of C++ PyPreviewFrame class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPreviewFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, PrintPreview preview, Frame parent, String title, Point pos=DefaultPosition, 
             Size size=DefaultSize, 
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame
         """
-        newobj = _windows_.new_PyPreviewFrame(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PyPreviewFrame_swiginit(self,_windows_.new_PyPreviewFrame(*args, **kwargs))
         self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -4897,40 +4583,47 @@ class PyPreviewFrame(PreviewFrame):
         """SetControlBar(self, PreviewControlBar bar)"""
         return _windows_.PyPreviewFrame_SetControlBar(*args, **kwargs)
 
-    def base_Initialize(*args, **kwargs):
-        """base_Initialize(self)"""
-        return _windows_.PyPreviewFrame_base_Initialize(*args, **kwargs)
+    def Initialize(*args, **kwargs):
+        """Initialize(self)"""
+        return _windows_.PyPreviewFrame_Initialize(*args, **kwargs)
+
+    def CreateCanvas(*args, **kwargs):
+        """CreateCanvas(self)"""
+        return _windows_.PyPreviewFrame_CreateCanvas(*args, **kwargs)
+
+    def CreateControlBar(*args, **kwargs):
+        """CreateControlBar(self)"""
+        return _windows_.PyPreviewFrame_CreateControlBar(*args, **kwargs)
 
-    def base_CreateCanvas(*args, **kwargs):
-        """base_CreateCanvas(self)"""
-        return _windows_.PyPreviewFrame_base_CreateCanvas(*args, **kwargs)
+    def base_Initialize(*args, **kw):
+        return PyPreviewFrame.Initialize(*args, **kw)
+    base_Initialize = wx._deprecated(base_Initialize,
+                                   "Please use PyPreviewFrame.Initialize instead.")
 
-    def base_CreateControlBar(*args, **kwargs):
-        """base_CreateControlBar(self)"""
-        return _windows_.PyPreviewFrame_base_CreateControlBar(*args, **kwargs)
+    def base_CreateCanvas(*args, **kw):
+        return PyPreviewFrame.CreateCanvas(*args, **kw)
+    base_CreateCanvas = wx._deprecated(base_CreateCanvas,
+                                   "Please use PyPreviewFrame.CreateCanvas instead.")
 
+    def base_CreateControlBar(*args, **kw):
+        return PyPreviewFrame.CreateControlBar(*args, **kw)
+    base_CreateControlBar = wx._deprecated(base_CreateControlBar,
+                                   "Please use PyPreviewFrame.CreateControlBar instead.")
 
-class PyPreviewFramePtr(PyPreviewFrame):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyPreviewFrame
-_windows_.PyPreviewFrame_swigregister(PyPreviewFramePtr)
+PyPreviewFrame_swigregister = _windows_.PyPreviewFrame_swigregister
+PyPreviewFrame_swigregister(PyPreviewFrame)
 
 class PyPreviewControlBar(PreviewControlBar):
     """Proxy of C++ PyPreviewControlBar class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyPreviewControlBar instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
         """
         __init__(self, PrintPreview preview, long buttons, Window parent, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, String name=PanelNameStr) -> PyPreviewControlBar
         """
-        newobj = _windows_.new_PyPreviewControlBar(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _windows_.PyPreviewControlBar_swiginit(self,_windows_.new_PyPreviewControlBar(*args, **kwargs))
         self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -4941,20 +4634,26 @@ class PyPreviewControlBar(PreviewControlBar):
         """SetPrintPreview(self, PrintPreview preview)"""
         return _windows_.PyPreviewControlBar_SetPrintPreview(*args, **kwargs)
 
-    def base_CreateButtons(*args, **kwargs):
-        """base_CreateButtons(self)"""
-        return _windows_.PyPreviewControlBar_base_CreateButtons(*args, **kwargs)
+    def CreateButtons(*args, **kwargs):
+        """CreateButtons(self)"""
+        return _windows_.PyPreviewControlBar_CreateButtons(*args, **kwargs)
+
+    def SetZoomControl(*args, **kwargs):
+        """SetZoomControl(self, int zoom)"""
+        return _windows_.PyPreviewControlBar_SetZoomControl(*args, **kwargs)
+
+    def base_CreateButtons(*args, **kw):
+        return PreviewControlBar.CreateButtons(*args, **kw)
+    base_CreateButtons = wx._deprecated(base_CreateButtons,
+                                   "Please use PreviewControlBar.CreateButtons instead.")
 
-    def base_SetZoomControl(*args, **kwargs):
-        """base_SetZoomControl(self, int zoom)"""
-        return _windows_.PyPreviewControlBar_base_SetZoomControl(*args, **kwargs)
+    def base_SetZoomControl(*args, **kw):
+        return PreviewControlBar.SetZoomControl(*args, **kw)
+    base_SetZoomControl = wx._deprecated(base_SetZoomControl,
+                                   "Please use PreviewControlBar.SetZoomControl instead.")
 
+PyPreviewControlBar_swigregister = _windows_.PyPreviewControlBar_swigregister
+PyPreviewControlBar_swigregister(PyPreviewControlBar)
 
-class PyPreviewControlBarPtr(PyPreviewControlBar):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyPreviewControlBar
-_windows_.PyPreviewControlBar_swigregister(PyPreviewControlBarPtr)