reSWIGed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/mac/calendar.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -6,17 +6,17 @@ Classes for an interactive Calendar control.
 """
 
 import _calendar
-
+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)
@@ -25,10 +25,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
@@ -41,7 +47,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)
@@ -73,9 +80,9 @@ class CalendarDateAttr(object):
     A set of customization attributes for a calendar date, which can be
     used to control the look of the Calendar object.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarDateAttr 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, Colour colText=wxNullColour, Colour colBack=wxNullColour, 
             Colour colBorder=wxNullColour, Font font=wxNullFont, 
@@ -83,10 +90,7 @@ class CalendarDateAttr(object):
 
         Create a CalendarDateAttr.
         """
-        newobj = _calendar.new_CalendarDateAttr(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _calendar.CalendarDateAttr_swiginit(self,_calendar.new_CalendarDateAttr(*args, **kwargs))
     def SetTextColour(*args, **kwargs):
         """SetTextColour(self, Colour colText)"""
         return _calendar.CalendarDateAttr_SetTextColour(*args, **kwargs)
@@ -155,24 +159,16 @@ class CalendarDateAttr(object):
         """GetBorder(self) -> int"""
         return _calendar.CalendarDateAttr_GetBorder(*args, **kwargs)
 
-
-class CalendarDateAttrPtr(CalendarDateAttr):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = CalendarDateAttr
-_calendar.CalendarDateAttr_swigregister(CalendarDateAttrPtr)
+CalendarDateAttr_swigregister = _calendar.CalendarDateAttr_swigregister
+CalendarDateAttr_swigregister(CalendarDateAttr)
 
 class CalendarEvent(_core.DateEvent):
     """Proxy of C++ CalendarEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarEvent 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, CalendarCtrl cal, wxEventType type) -> CalendarEvent"""
-        newobj = _calendar.new_CalendarEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _calendar.CalendarEvent_swiginit(self,_calendar.new_CalendarEvent(*args, **kwargs))
     def SetWeekDay(*args, **kwargs):
         """SetWeekDay(self, int wd)"""
         return _calendar.CalendarEvent_SetWeekDay(*args, **kwargs)
@@ -189,13 +185,8 @@ class CalendarEvent(_core.DateEvent):
         """returns datetime.date object"""
         return _wxdate2pydate(self.GetDate())
 
-
-class CalendarEventPtr(CalendarEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = CalendarEvent
-_calendar.CalendarEvent_swigregister(CalendarEventPtr)
+CalendarEvent_swigregister = _calendar.CalendarEvent_swigregister
+CalendarEvent_swigregister(CalendarEvent)
 
 wxEVT_CALENDAR_DOUBLECLICKED = _calendar.wxEVT_CALENDAR_DOUBLECLICKED
 wxEVT_CALENDAR_SEL_CHANGED = _calendar.wxEVT_CALENDAR_SEL_CHANGED
@@ -237,9 +228,9 @@ class CalendarCtrl(_core.Control):
     month is changed, so you will often want to update them in an
     EVT_CALENDAR_MONTH event handler.
     """
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCalendarCtrl 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, DateTime date=DefaultDateTime, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
@@ -248,10 +239,7 @@ class CalendarCtrl(_core.Control):
 
         Create and show a calendar control.
         """
-        newobj = _calendar.new_CalendarCtrl(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _calendar.CalendarCtrl_swiginit(self,_calendar.new_CalendarCtrl(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -537,13 +525,8 @@ class CalendarCtrl(_core.Control):
         """returns datetime.date object"""
         return _wxdate2pydate(self.GetUpperDateLimit())
 
-
-class CalendarCtrlPtr(CalendarCtrl):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = CalendarCtrl
-_calendar.CalendarCtrl_swigregister(CalendarCtrlPtr)
+CalendarCtrl_swigregister = _calendar.CalendarCtrl_swigregister
+CalendarCtrl_swigregister(CalendarCtrl)
 cvar = _calendar.cvar
 CalendarNameStr = cvar.CalendarNameStr
 
@@ -554,11 +537,10 @@ def PreCalendarCtrl(*args, **kwargs):
     Precreate a CalendarCtrl for 2-phase creation.
     """
     val = _calendar.new_PreCalendarCtrl(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs):
-    """
+  """
     CalendarCtrl_GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
 
     Get the default attributes for this class.  This is useful if you want
@@ -572,7 +554,7 @@ def CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs):
     the returned font. See `wx.Window.SetWindowVariant` for more about
     this.
     """
-    return _calendar.CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs)
+  return _calendar.CalendarCtrl_GetClassDefaultAttributes(*args, **kwargs)
 
 def _pydate2wxdate(date):
     import datetime

wxPython/src/mac/media.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -6,17 +6,17 @@ Classes for a media player control
 """
 
 import _media
-
+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)
@@ -25,10 +25,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
@@ -41,7 +47,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)
@@ -60,21 +67,13 @@ MEDIACTRLPLAYERCONTROLS_VOLUME = _media.MEDIACTRLPLAYERCONTROLS_VOLUME
 MEDIACTRLPLAYERCONTROLS_DEFAULT = _media.MEDIACTRLPLAYERCONTROLS_DEFAULT
 class MediaEvent(_core.NotifyEvent):
     """Proxy of C++ MediaEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMediaEvent 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) -> MediaEvent"""
-        newobj = _media.new_MediaEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class MediaEventPtr(MediaEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MediaEvent
-_media.MediaEvent_swigregister(MediaEventPtr)
+        _media.MediaEvent_swiginit(self,_media.new_MediaEvent(*args, **kwargs))
+MediaEvent_swigregister = _media.MediaEvent_swigregister
+MediaEvent_swigregister(MediaEvent)
 cvar = _media.cvar
 MEDIABACKEND_DIRECTSHOW = cvar.MEDIABACKEND_DIRECTSHOW
 MEDIABACKEND_MCI = cvar.MEDIABACKEND_MCI
@@ -85,9 +84,9 @@ MEDIABACKEND_WMP10 = cvar.MEDIABACKEND_WMP10
 
 class MediaCtrl(_core.Control):
     """Proxy of C++ MediaCtrl class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMediaCtrl 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 fileName=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
@@ -95,10 +94,7 @@ class MediaCtrl(_core.Control):
             Validator validator=DefaultValidator, 
             String name=MediaCtrlNameStr) -> MediaCtrl
         """
-        newobj = _media.new_MediaCtrl(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _media.MediaCtrl_swiginit(self,_media.new_MediaCtrl(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -180,19 +176,13 @@ class MediaCtrl(_core.Control):
         """GetDownloadTotal(self) -> wxFileOffset"""
         return _media.MediaCtrl_GetDownloadTotal(*args, **kwargs)
 
-
-class MediaCtrlPtr(MediaCtrl):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MediaCtrl
-_media.MediaCtrl_swigregister(MediaCtrlPtr)
+MediaCtrl_swigregister = _media.MediaCtrl_swigregister
+MediaCtrl_swigregister(MediaCtrl)
 MediaCtrlNameStr = cvar.MediaCtrlNameStr
 
 def PreMediaCtrl(*args, **kwargs):
     """PreMediaCtrl() -> MediaCtrl"""
     val = _media.new_PreMediaCtrl(*args, **kwargs)
-    val.thisown = 1
     return val
 
 wxEVT_MEDIA_FINISHED = _media.wxEVT_MEDIA_FINISHED

wxPython/src/mac/webkit.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -6,17 +6,17 @@ wx.webkit.WebKitCtrl for Mac OSX.
 """
 
 import _webkit
-
+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)
@@ -25,10 +25,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
@@ -41,7 +47,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)
@@ -53,19 +60,16 @@ wx = _core
 __docfilter__ = wx.__DocFilter(globals()) 
 class WebKitCtrl(_core.Control):
     """Proxy of C++ WebKitCtrl class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWebKitCtrl 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 winID=-1, String strURL=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=0, Validator validator=DefaultValidator, 
             String name=WebKitNameStr) -> WebKitCtrl
         """
-        newobj = _webkit.new_WebKitCtrl(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _webkit.WebKitCtrl_swiginit(self,_webkit.new_WebKitCtrl(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -125,20 +129,14 @@ class WebKitCtrl(_core.Control):
         """GetPageTitle(self) -> String"""
         return _webkit.WebKitCtrl_GetPageTitle(*args, **kwargs)
 
-
-class WebKitCtrlPtr(WebKitCtrl):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WebKitCtrl
-_webkit.WebKitCtrl_swigregister(WebKitCtrlPtr)
+WebKitCtrl_swigregister = _webkit.WebKitCtrl_swigregister
+WebKitCtrl_swigregister(WebKitCtrl)
 cvar = _webkit.cvar
 WebKitNameStr = cvar.WebKitNameStr
 
 def PreWebKitCtrl(*args, **kwargs):
     """PreWebKitCtrl() -> WebKitCtrl"""
     val = _webkit.new_PreWebKitCtrl(*args, **kwargs)
-    val.thisown = 1
     return val
 
 WEBKIT_STATE_START = _webkit.WEBKIT_STATE_START
@@ -150,14 +148,11 @@ WEBKIT_STATE_FAILED = _webkit.WEBKIT_STATE_FAILED
 wxEVT_WEBKIT_STATE_CHANGED = _webkit.wxEVT_WEBKIT_STATE_CHANGED
 class WebKitStateChangedEvent(_core.CommandEvent):
     """Proxy of C++ WebKitStateChangedEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWebKitStateChangedEvent 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 win=None) -> WebKitStateChangedEvent"""
-        newobj = _webkit.new_WebKitStateChangedEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _webkit.WebKitStateChangedEvent_swiginit(self,_webkit.new_WebKitStateChangedEvent(*args, **kwargs))
     def GetState(*args, **kwargs):
         """GetState(self) -> int"""
         return _webkit.WebKitStateChangedEvent_GetState(*args, **kwargs)
@@ -174,13 +169,8 @@ class WebKitStateChangedEvent(_core.CommandEvent):
         """SetURL(self, String url)"""
         return _webkit.WebKitStateChangedEvent_SetURL(*args, **kwargs)
 
-
-class WebKitStateChangedEventPtr(WebKitStateChangedEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WebKitStateChangedEvent
-_webkit.WebKitStateChangedEvent_swigregister(WebKitStateChangedEventPtr)
+WebKitStateChangedEvent_swigregister = _webkit.WebKitStateChangedEvent_swigregister
+WebKitStateChangedEvent_swigregister(WebKitStateChangedEvent)
 
 EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)
 

wxPython/src/mac/wizard.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -7,17 +7,17 @@ or pages.
 """
 
 import _wizard
-
+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)
@@ -26,10 +26,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
@@ -42,7 +48,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)
@@ -67,17 +74,14 @@ EVT_WIZARD_FINISHED      = wx.PyEventBinder( wxEVT_WIZARD_FINISHED, 1)
 
 class WizardEvent(_core.NotifyEvent):
     """Proxy of C++ WizardEvent class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizardEvent 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, int id=-1, bool direction=True, 
             WizardPage page=None) -> WizardEvent
         """
-        newobj = _wizard.new_WizardEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _wizard.WizardEvent_swiginit(self,_wizard.new_WizardEvent(*args, **kwargs))
     def GetDirection(*args, **kwargs):
         """GetDirection(self) -> bool"""
         return _wizard.WizardEvent_GetDirection(*args, **kwargs)
@@ -86,19 +90,14 @@ class WizardEvent(_core.NotifyEvent):
         """GetPage(self) -> WizardPage"""
         return _wizard.WizardEvent_GetPage(*args, **kwargs)
 
-
-class WizardEventPtr(WizardEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WizardEvent
-_wizard.WizardEvent_swigregister(WizardEventPtr)
+WizardEvent_swigregister = _wizard.WizardEvent_swigregister
+WizardEvent_swigregister(WizardEvent)
 
 class WizardPage(_windows.Panel):
     """Proxy of C++ WizardPage class"""
-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizardPage 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 Create(*args, **kwargs):
         """Create(self, Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""
         return _wizard.WizardPage_Create(*args, **kwargs)
@@ -115,24 +114,16 @@ class WizardPage(_windows.Panel):
         """GetBitmap(self) -> Bitmap"""
         return _wizard.WizardPage_GetBitmap(*args, **kwargs)
 
-
-class WizardPagePtr(WizardPage):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WizardPage
-_wizard.WizardPage_swigregister(WizardPagePtr)
+WizardPage_swigregister = _wizard.WizardPage_swigregister
+WizardPage_swigregister(WizardPage)
 
 class PyWizardPage(WizardPage):
     """Proxy of C++ PyWizardPage class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyWizardPage 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, Wizard parent, Bitmap bitmap=&wxNullBitmap, String resource=&wxPyEmptyString) -> PyWizardPage"""
-        newobj = _wizard.new_PyWizardPage(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _wizard.PyWizardPage_swiginit(self,_wizard.new_PyWizardPage(*args, **kwargs))
         self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -179,102 +170,6 @@ class PyWizardPage(WizardPage):
         """DoGetBestSize(self) -> Size"""
         return _wizard.PyWizardPage_DoGetBestSize(*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 _wizard.PyWizardPage_InitDialog(*args, **kwargs)
-
-    def TransferDataToWindow(*args, **kwargs):
-        """
-        TransferDataToWindow(self) -> bool
-
-        Transfers values to child controls from data areas specified by their
-        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
-        style flag set, the method will also call TransferDataToWindow() of
-        all child windows.
-        """
-        return _wizard.PyWizardPage_TransferDataToWindow(*args, **kwargs)
-
-    def TransferDataFromWindow(*args, **kwargs):
-        """
-        TransferDataFromWindow(self) -> bool
-
-        Transfers values from child controls to data areas specified by their
-        validators. Returns false if a transfer failed.  If the window has
-        wx.WS_EX_VALIDATE_RECURSIVELY extra style flag set, the method will
-        also call TransferDataFromWindow() of all child windows.
-        """
-        return _wizard.PyWizardPage_TransferDataFromWindow(*args, **kwargs)
-
-    def Validate(*args, **kwargs):
-        """
-        Validate(self) -> bool
-
-        Validates the current values of the child controls using their
-        validators.  If the window has wx.WS_EX_VALIDATE_RECURSIVELY extra
-        style flag set, the method will also call Validate() of all child
-        windows.  Returns false if any of the validations failed.
-        """
-        return _wizard.PyWizardPage_Validate(*args, **kwargs)
-
-    def AcceptsFocus(*args, **kwargs):
-        """
-        AcceptsFocus(self) -> bool
-
-        Can this window have focus?
-        """
-        return _wizard.PyWizardPage_AcceptsFocus(*args, **kwargs)
-
-    def AcceptsFocusFromKeyboard(*args, **kwargs):
-        """
-        AcceptsFocusFromKeyboard(self) -> bool
-
-        Can this window be given focus by keyboard navigation? if not, the
-        only way to give it focus (provided it accepts it at all) is to click
-        it.
-        """
-        return _wizard.PyWizardPage_AcceptsFocusFromKeyboard(*args, **kwargs)
-
-    def GetMaxSize(*args, **kwargs):
-        """GetMaxSize(self) -> Size"""
-        return _wizard.PyWizardPage_GetMaxSize(*args, **kwargs)
-
-    def AddChild(*args, **kwargs):
-        """
-        AddChild(self, Window child)
-
-        Adds a child window. This is called automatically by window creation
-        functions so should not be required by the application programmer.
-        """
-        return _wizard.PyWizardPage_AddChild(*args, **kwargs)
-
-    def RemoveChild(*args, **kwargs):
-        """
-        RemoveChild(self, Window child)
-
-        Removes a child window. This is called automatically by window
-        deletion functions so should not be required by the application
-        programmer.
-        """
-        return _wizard.PyWizardPage_RemoveChild(*args, **kwargs)
-
-    def ShouldInheritColours(*args, **kwargs):
-        """
-        ShouldInheritColours(self) -> bool
-
-        Return true from here to allow the colours of this window to be
-        changed by InheritAttributes, returning false forbids inheriting them
-        from the parent window.
-
-        The base class version returns false, but this method is overridden in
-        wxControl where it returns true.
-        """
-        return _wizard.PyWizardPage_ShouldInheritColours(*args, **kwargs)
-
     def GetDefaultAttributes(*args, **kwargs):
         """GetDefaultAttributes(self) -> VisualAttributes"""
         return _wizard.PyWizardPage_GetDefaultAttributes(*args, **kwargs)
@@ -388,33 +283,24 @@ class PyWizardPage(WizardPage):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyWizardPage.OnInternalIdle instead.")
 
-
-class PyWizardPagePtr(PyWizardPage):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyWizardPage
-_wizard.PyWizardPage_swigregister(PyWizardPagePtr)
+PyWizardPage_swigregister = _wizard.PyWizardPage_swigregister
+PyWizardPage_swigregister(PyWizardPage)
 
 def PrePyWizardPage(*args, **kwargs):
     """PrePyWizardPage() -> PyWizardPage"""
     val = _wizard.new_PrePyWizardPage(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class WizardPageSimple(WizardPage):
     """Proxy of C++ WizardPageSimple class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizardPageSimple 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, Wizard parent, WizardPage prev=None, WizardPage next=None, 
             Bitmap bitmap=wxNullBitmap, wxChar resource=None) -> WizardPageSimple
         """
-        newobj = _wizard.new_WizardPageSimple(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _wizard.WizardPageSimple_swiginit(self,_wizard.new_WizardPageSimple(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -437,38 +323,29 @@ class WizardPageSimple(WizardPage):
         return _wizard.WizardPageSimple_Chain(*args, **kwargs)
 
     Chain = staticmethod(Chain)
-
-class WizardPageSimplePtr(WizardPageSimple):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WizardPageSimple
-_wizard.WizardPageSimple_swigregister(WizardPageSimplePtr)
+WizardPageSimple_swigregister = _wizard.WizardPageSimple_swigregister
+WizardPageSimple_swigregister(WizardPageSimple)
 
 def PreWizardPageSimple(*args, **kwargs):
     """PreWizardPageSimple() -> WizardPageSimple"""
     val = _wizard.new_PreWizardPageSimple(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def WizardPageSimple_Chain(*args, **kwargs):
-    """WizardPageSimple_Chain(WizardPageSimple first, WizardPageSimple second)"""
-    return _wizard.WizardPageSimple_Chain(*args, **kwargs)
+  """WizardPageSimple_Chain(WizardPageSimple first, WizardPageSimple second)"""
+  return _wizard.WizardPageSimple_Chain(*args, **kwargs)
 
 class Wizard(_windows.Dialog):
     """Proxy of C++ Wizard class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWizard 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, 
             Bitmap bitmap=wxNullBitmap, Point pos=DefaultPosition, 
             long style=DEFAULT_DIALOG_STYLE) -> Wizard
         """
-        newobj = _wizard.new_Wizard(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _wizard.Wizard_swiginit(self,_wizard.new_Wizard(*args, **kwargs))
         self._setOORInfo(self)
 
     def Create(*args, **kwargs):
@@ -526,18 +403,12 @@ class Wizard(_windows.Dialog):
         """HasPrevPage(self, WizardPage page) -> bool"""
         return _wizard.Wizard_HasPrevPage(*args, **kwargs)
 
-
-class WizardPtr(Wizard):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Wizard
-_wizard.Wizard_swigregister(WizardPtr)
+Wizard_swigregister = _wizard.Wizard_swigregister
+Wizard_swigregister(Wizard)
 
 def PreWizard(*args, **kwargs):
     """PreWizard() -> Wizard"""
     val = _wizard.new_PreWizard(*args, **kwargs)
-    val.thisown = 1
     return val
 
 

wxPython/src/mac/xrc.py

@@ -1,4 +1,4 @@
-# This file was created automatically by SWIG 1.3.27.
+# This file was created automatically by SWIG 1.3.29.
 # Don't modify this file, modify the SWIG interface instead.
 
 """
@@ -7,17 +7,17 @@ controls on a panel, etc. to be loaded from an XML file.
 """
 
 import _xrc
-
+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)
@@ -26,10 +26,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
@@ -42,7 +48,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)
@@ -63,22 +70,15 @@ XRC_NO_SUBCLASSING = _xrc.XRC_NO_SUBCLASSING
 XRC_NO_RELOADING = _xrc.XRC_NO_RELOADING
 class XmlResource(_core.Object):
     """Proxy of C++ XmlResource class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlResource 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 filemask, int flags=XRC_USE_LOCALE) -> XmlResource"""
-        newobj = _xrc.new_XmlResource(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlResource_swiginit(self,_xrc.new_XmlResource(*args, **kwargs))
         self.InitAllHandlers()
 
-    def __del__(self, destroy=_xrc.delete_XmlResource):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    __swig_destroy__ = _xrc.delete_XmlResource
+    __del__ = lambda self : None;
     def Load(*args, **kwargs):
         """Load(self, String filemask) -> bool"""
         return _xrc.XmlResource_Load(*args, **kwargs)
@@ -203,13 +203,8 @@ class XmlResource(_core.Object):
         """SetFlags(self, int flags)"""
         return _xrc.XmlResource_SetFlags(*args, **kwargs)
 
-
-class XmlResourcePtr(XmlResource):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlResource
-_xrc.XmlResource_swigregister(XmlResourcePtr)
+XmlResource_swigregister = _xrc.XmlResource_swigregister
+XmlResource_swigregister(XmlResource)
 cvar = _xrc.cvar
 UTF8String = cvar.UTF8String
 StyleString = cvar.StyleString
@@ -222,25 +217,24 @@ FontString = cvar.FontString
 def EmptyXmlResource(*args, **kwargs):
     """EmptyXmlResource(int flags=XRC_USE_LOCALE) -> XmlResource"""
     val = _xrc.new_EmptyXmlResource(*args, **kwargs)
-    val.thisown = 1
     val.InitAllHandlers()
     return val
 
 def XmlResource_AddSubclassFactory(*args, **kwargs):
-    """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
-    return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
+  """XmlResource_AddSubclassFactory(XmlSubclassFactory factory)"""
+  return _xrc.XmlResource_AddSubclassFactory(*args, **kwargs)
 
 def XmlResource_GetXRCID(*args, **kwargs):
-    """XmlResource_GetXRCID(String str_id) -> int"""
-    return _xrc.XmlResource_GetXRCID(*args, **kwargs)
+  """XmlResource_GetXRCID(String str_id) -> int"""
+  return _xrc.XmlResource_GetXRCID(*args, **kwargs)
 
-def XmlResource_Get(*args, **kwargs):
-    """XmlResource_Get() -> XmlResource"""
-    return _xrc.XmlResource_Get(*args, **kwargs)
+def XmlResource_Get(*args):
+  """XmlResource_Get() -> XmlResource"""
+  return _xrc.XmlResource_Get(*args)
 
 def XmlResource_Set(*args, **kwargs):
-    """XmlResource_Set(XmlResource res) -> XmlResource"""
-    return _xrc.XmlResource_Set(*args, **kwargs)
+  """XmlResource_Set(XmlResource res) -> XmlResource"""
+  return _xrc.XmlResource_Set(*args, **kwargs)
 
 def XRCID(str_id):
     return XmlResource_GetXRCID(str_id)
@@ -252,27 +246,19 @@ def XRCCTRL(window, str_id, *ignoreargs):
 
 class XmlSubclassFactory(object):
     """Proxy of C++ XmlSubclassFactory class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlSubclassFactory 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) -> XmlSubclassFactory"""
-        newobj = _xrc.new_XmlSubclassFactory(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlSubclassFactory_swiginit(self,_xrc.new_XmlSubclassFactory(*args, **kwargs))
         self._setCallbackInfo(self, XmlSubclassFactory)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _xrc.XmlSubclassFactory__setCallbackInfo(*args, **kwargs)
 
-
-class XmlSubclassFactoryPtr(XmlSubclassFactory):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlSubclassFactory
-_xrc.XmlSubclassFactory_swigregister(XmlSubclassFactoryPtr)
+XmlSubclassFactory_swigregister = _xrc.XmlSubclassFactory_swigregister
+XmlSubclassFactory_swigregister(XmlSubclassFactory)
 
 #---------------------------------------------------------------------------
 
@@ -291,17 +277,14 @@ XML_NOTATION_NODE = _xrc.XML_NOTATION_NODE
 XML_HTML_DOCUMENT_NODE = _xrc.XML_HTML_DOCUMENT_NODE
 class XmlProperty(object):
     """Proxy of C++ XmlProperty class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlProperty 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 name=EmptyString, String value=EmptyString, 
             XmlProperty next=None) -> XmlProperty
         """
-        newobj = _xrc.new_XmlProperty(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlProperty_swiginit(self,_xrc.new_XmlProperty(*args, **kwargs))
     def GetName(*args, **kwargs):
         """GetName(self) -> String"""
         return _xrc.XmlProperty_GetName(*args, **kwargs)
@@ -326,34 +309,22 @@ class XmlProperty(object):
         """SetNext(self, XmlProperty next)"""
         return _xrc.XmlProperty_SetNext(*args, **kwargs)
 
-
-class XmlPropertyPtr(XmlProperty):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlProperty
-_xrc.XmlProperty_swigregister(XmlPropertyPtr)
+XmlProperty_swigregister = _xrc.XmlProperty_swigregister
+XmlProperty_swigregister(XmlProperty)
 
 class XmlNode(object):
     """Proxy of C++ XmlNode class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlNode 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, XmlNode parent=None, int type=0, String name=EmptyString, 
             String content=EmptyString, XmlProperty props=None, 
             XmlNode next=None) -> XmlNode
         """
-        newobj = _xrc.new_XmlNode(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_xrc.delete_XmlNode):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _xrc.XmlNode_swiginit(self,_xrc.new_XmlNode(*args, **kwargs))
+    __swig_destroy__ = _xrc.delete_XmlNode
+    __del__ = lambda self : None;
     def AddChild(*args, **kwargs):
         """AddChild(self, XmlNode child)"""
         return _xrc.XmlNode_AddChild(*args, **kwargs)
@@ -442,36 +413,23 @@ class XmlNode(object):
         """SetProperties(self, XmlProperty prop)"""
         return _xrc.XmlNode_SetProperties(*args, **kwargs)
 
-
-class XmlNodePtr(XmlNode):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlNode
-_xrc.XmlNode_swigregister(XmlNodePtr)
+XmlNode_swigregister = _xrc.XmlNode_swigregister
+XmlNode_swigregister(XmlNode)
 
 def XmlNodeEasy(*args, **kwargs):
     """XmlNodeEasy(int type, String name, String content=EmptyString) -> XmlNode"""
     val = _xrc.new_XmlNodeEasy(*args, **kwargs)
-    val.thisown = 1
     return val
 
 class XmlDocument(_core.Object):
     """Proxy of C++ XmlDocument class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxXmlDocument 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 filename, String encoding=UTF8String) -> XmlDocument"""
-        newobj = _xrc.new_XmlDocument(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_xrc.delete_XmlDocument):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _xrc.XmlDocument_swiginit(self,_xrc.new_XmlDocument(*args, **kwargs))
+    __swig_destroy__ = _xrc.delete_XmlDocument
+    __del__ = lambda self : None;
     def Load(*args, **kwargs):
         """Load(self, String filename, String encoding=UTF8String) -> bool"""
         return _xrc.XmlDocument_Load(*args, **kwargs)
@@ -516,38 +474,28 @@ class XmlDocument(_core.Object):
         """SetFileEncoding(self, String encoding)"""
         return _xrc.XmlDocument_SetFileEncoding(*args, **kwargs)
 
-
-class XmlDocumentPtr(XmlDocument):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlDocument
-_xrc.XmlDocument_swigregister(XmlDocumentPtr)
+XmlDocument_swigregister = _xrc.XmlDocument_swigregister
+XmlDocument_swigregister(XmlDocument)
 
 def XmlDocumentFromStream(*args, **kwargs):
     """XmlDocumentFromStream(InputStream stream, String encoding=UTF8String) -> XmlDocument"""
     val = _xrc.new_XmlDocumentFromStream(*args, **kwargs)
-    val.thisown = 1
     return val
 
 def EmptyXmlDocument(*args, **kwargs):
     """EmptyXmlDocument() -> XmlDocument"""
     val = _xrc.new_EmptyXmlDocument(*args, **kwargs)
-    val.thisown = 1
     return val
 
 #---------------------------------------------------------------------------
 
 class XmlResourceHandler(_core.Object):
     """Proxy of C++ XmlResourceHandler class"""
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyXmlResourceHandler 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) -> XmlResourceHandler"""
-        newobj = _xrc.new_XmlResourceHandler(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _xrc.XmlResourceHandler_swiginit(self,_xrc.new_XmlResourceHandler(*args, **kwargs))
         self._setCallbackInfo(self, XmlResourceHandler)
 
     def _setCallbackInfo(*args, **kwargs):
@@ -692,13 +640,8 @@ class XmlResourceHandler(_core.Object):
         """GetCurFileSystem(self) -> FileSystem"""
         return _xrc.XmlResourceHandler_GetCurFileSystem(*args, **kwargs)
 
-
-class XmlResourceHandlerPtr(XmlResourceHandler):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = XmlResourceHandler
-_xrc.XmlResourceHandler_swigregister(XmlResourceHandlerPtr)
+XmlResourceHandler_swigregister = _xrc.XmlResourceHandler_swigregister
+XmlResourceHandler_swigregister(XmlResourceHandler)
 
 #----------------------------------------------------------------------------
 # The global was removed  in favor of static accessor functions.  This is for