pywrap should be treated as a gui script

[wxWidgets.git] / wxPython / src / mac / _misc.py

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 40b0cd7a8cba691f70852e91c0de5f43b0d5e850..5a74e15036c2e8b16b5e316fb7050e8ac798b966 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -1,7 +1,55 @@
-# 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 _misc_
 # Don't modify this file, modify the SWIG interface instead.
 
 import _misc_

+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 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):
+        self.__dict__[name] = value
+    else:
+        raise AttributeError("You cannot add attributes to %s" % self)
+
+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
+    _newclass = 1
+except AttributeError:
+    class _object : pass
+    _newclass = 0
+del types
+
+
+def _swig_setattr_nondynamic_method(set):
+    def set_attr(self,name,value):
+        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)
+    return set_attr
+

 
 import _core
 wx = _core 
 
 import _core
 wx = _core 


@@ -93,15 +141,17 @@ SYS_SHOW_SOUNDS = _misc_.SYS_SHOW_SOUNDS
 SYS_SWAP_BUTTONS = _misc_.SYS_SWAP_BUTTONS
 SYS_CAN_DRAW_FRAME_DECORATIONS = _misc_.SYS_CAN_DRAW_FRAME_DECORATIONS
 SYS_CAN_ICONIZE_FRAME = _misc_.SYS_CAN_ICONIZE_FRAME
 SYS_SWAP_BUTTONS = _misc_.SYS_SWAP_BUTTONS
 SYS_CAN_DRAW_FRAME_DECORATIONS = _misc_.SYS_CAN_DRAW_FRAME_DECORATIONS
 SYS_CAN_ICONIZE_FRAME = _misc_.SYS_CAN_ICONIZE_FRAME

+SYS_TABLET_PRESENT = _misc_.SYS_TABLET_PRESENT

 SYS_SCREEN_NONE = _misc_.SYS_SCREEN_NONE
 SYS_SCREEN_TINY = _misc_.SYS_SCREEN_TINY
 SYS_SCREEN_PDA = _misc_.SYS_SCREEN_PDA
 SYS_SCREEN_SMALL = _misc_.SYS_SCREEN_SMALL
 SYS_SCREEN_DESKTOP = _misc_.SYS_SCREEN_DESKTOP
 class SystemSettings(object):
 SYS_SCREEN_NONE = _misc_.SYS_SCREEN_NONE
 SYS_SCREEN_TINY = _misc_.SYS_SCREEN_TINY
 SYS_SCREEN_PDA = _misc_.SYS_SCREEN_PDA
 SYS_SCREEN_SMALL = _misc_.SYS_SCREEN_SMALL
 SYS_SCREEN_DESKTOP = _misc_.SYS_SCREEN_DESKTOP
 class SystemSettings(object):

-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    """Proxy of C++ SystemSettings class"""
+    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 GetColour(*args, **kwargs):
         """GetColour(int index) -> Colour"""
         return _misc_.SystemSettings_GetColour(*args, **kwargs)
     def GetColour(*args, **kwargs):
         """GetColour(int index) -> Colour"""
         return _misc_.SystemSettings_GetColour(*args, **kwargs)


@@ -113,7 +163,7 @@ class SystemSettings(object):
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):

-        """GetMetric(int index) -> int"""
+        """GetMetric(int index, Window win=None) -> int"""

         return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
         return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)


@@ -132,47 +182,39 @@ class SystemSettings(object):
         return _misc_.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)
         return _misc_.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)

-
-class SystemSettingsPtr(SystemSettings):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SystemSettings
-_misc_.SystemSettings_swigregister(SystemSettingsPtr)
+_misc_.SystemSettings_swigregister(SystemSettings)

 
 def SystemSettings_GetColour(*args, **kwargs):
 
 def SystemSettings_GetColour(*args, **kwargs):

-    """SystemSettings_GetColour(int index) -> Colour"""
-    return _misc_.SystemSettings_GetColour(*args, **kwargs)
+  """SystemSettings_GetColour(int index) -> Colour"""
+  return _misc_.SystemSettings_GetColour(*args, **kwargs)

 
 def SystemSettings_GetFont(*args, **kwargs):
 
 def SystemSettings_GetFont(*args, **kwargs):

-    """SystemSettings_GetFont(int index) -> Font"""
-    return _misc_.SystemSettings_GetFont(*args, **kwargs)
+  """SystemSettings_GetFont(int index) -> Font"""
+  return _misc_.SystemSettings_GetFont(*args, **kwargs)

 
 def SystemSettings_GetMetric(*args, **kwargs):
 
 def SystemSettings_GetMetric(*args, **kwargs):

-    """SystemSettings_GetMetric(int index) -> int"""
-    return _misc_.SystemSettings_GetMetric(*args, **kwargs)
+  """SystemSettings_GetMetric(int index, Window win=None) -> int"""
+  return _misc_.SystemSettings_GetMetric(*args, **kwargs)

 
 def SystemSettings_HasFeature(*args, **kwargs):
 
 def SystemSettings_HasFeature(*args, **kwargs):

-    """SystemSettings_HasFeature(int index) -> bool"""
-    return _misc_.SystemSettings_HasFeature(*args, **kwargs)
+  """SystemSettings_HasFeature(int index) -> bool"""
+  return _misc_.SystemSettings_HasFeature(*args, **kwargs)

 
 

-def SystemSettings_GetScreenType(*args, **kwargs):
-    """SystemSettings_GetScreenType() -> int"""
-    return _misc_.SystemSettings_GetScreenType(*args, **kwargs)
+def SystemSettings_GetScreenType(*args):
+  """SystemSettings_GetScreenType() -> int"""
+  return _misc_.SystemSettings_GetScreenType(*args)

 
 def SystemSettings_SetScreenType(*args, **kwargs):
 
 def SystemSettings_SetScreenType(*args, **kwargs):

-    """SystemSettings_SetScreenType(int screen)"""
-    return _misc_.SystemSettings_SetScreenType(*args, **kwargs)
+  """SystemSettings_SetScreenType(int screen)"""
+  return _misc_.SystemSettings_SetScreenType(*args, **kwargs)

 
 class SystemOptions(_core.Object):
 
 class SystemOptions(_core.Object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ SystemOptions class"""
+    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) -> SystemOptions"""
         """__init__(self) -> SystemOptions"""

-        newobj = _misc_.new_SystemOptions(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.SystemOptions_swiginit(self,_misc_.new_SystemOptions(*args, **kwargs))

     def SetOption(*args, **kwargs):
         """SetOption(String name, String value)"""
         return _misc_.SystemOptions_SetOption(*args, **kwargs)
     def SetOption(*args, **kwargs):
         """SetOption(String name, String value)"""
         return _misc_.SystemOptions_SetOption(*args, **kwargs)


@@ -198,153 +240,207 @@ class SystemOptions(_core.Object):
         return _misc_.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)
         return _misc_.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)

+    def IsFalse(*args, **kwargs):
+        """IsFalse(String name) -> bool"""
+        return _misc_.SystemOptions_IsFalse(*args, **kwargs)

 
 

-class SystemOptionsPtr(SystemOptions):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SystemOptions
-_misc_.SystemOptions_swigregister(SystemOptionsPtr)
+    IsFalse = staticmethod(IsFalse)
+_misc_.SystemOptions_swigregister(SystemOptions)
+cvar = _misc_.cvar
+WINDOW_DEFAULT_VARIANT = cvar.WINDOW_DEFAULT_VARIANT

 
 def SystemOptions_SetOption(*args, **kwargs):
 
 def SystemOptions_SetOption(*args, **kwargs):

-    """SystemOptions_SetOption(String name, String value)"""
-    return _misc_.SystemOptions_SetOption(*args, **kwargs)
+  """SystemOptions_SetOption(String name, String value)"""
+  return _misc_.SystemOptions_SetOption(*args, **kwargs)

 
 def SystemOptions_SetOptionInt(*args, **kwargs):
 
 def SystemOptions_SetOptionInt(*args, **kwargs):

-    """SystemOptions_SetOptionInt(String name, int value)"""
-    return _misc_.SystemOptions_SetOptionInt(*args, **kwargs)
+  """SystemOptions_SetOptionInt(String name, int value)"""
+  return _misc_.SystemOptions_SetOptionInt(*args, **kwargs)

 
 def SystemOptions_GetOption(*args, **kwargs):
 
 def SystemOptions_GetOption(*args, **kwargs):

-    """SystemOptions_GetOption(String name) -> String"""
-    return _misc_.SystemOptions_GetOption(*args, **kwargs)
+  """SystemOptions_GetOption(String name) -> String"""
+  return _misc_.SystemOptions_GetOption(*args, **kwargs)

 
 def SystemOptions_GetOptionInt(*args, **kwargs):
 
 def SystemOptions_GetOptionInt(*args, **kwargs):

-    """SystemOptions_GetOptionInt(String name) -> int"""
-    return _misc_.SystemOptions_GetOptionInt(*args, **kwargs)
+  """SystemOptions_GetOptionInt(String name) -> int"""
+  return _misc_.SystemOptions_GetOptionInt(*args, **kwargs)

 
 def SystemOptions_HasOption(*args, **kwargs):
 
 def SystemOptions_HasOption(*args, **kwargs):

-    """SystemOptions_HasOption(String name) -> bool"""
-    return _misc_.SystemOptions_HasOption(*args, **kwargs)
+  """SystemOptions_HasOption(String name) -> bool"""
+  return _misc_.SystemOptions_HasOption(*args, **kwargs)
+
+def SystemOptions_IsFalse(*args, **kwargs):
+  """SystemOptions_IsFalse(String name) -> bool"""
+  return _misc_.SystemOptions_IsFalse(*args, **kwargs)

 
 #---------------------------------------------------------------------------
 
 
 
 #---------------------------------------------------------------------------
 
 

-def NewId(*args, **kwargs):
-    """NewId() -> long"""
-    return _misc_.NewId(*args, **kwargs)
+def NewId(*args):
+  """NewId() -> long"""
+  return _misc_.NewId(*args)

 
 def RegisterId(*args, **kwargs):
 
 def RegisterId(*args, **kwargs):

-    """RegisterId(long id)"""
-    return _misc_.RegisterId(*args, **kwargs)
-
-def GetCurrentId(*args, **kwargs):
-    """GetCurrentId() -> long"""
-    return _misc_.GetCurrentId(*args, **kwargs)
-
-def Bell(*args, **kwargs):
-    """Bell()"""
-    return _misc_.Bell(*args, **kwargs)
+  """RegisterId(long id)"""
+  return _misc_.RegisterId(*args, **kwargs)

 
 

-def EndBusyCursor(*args, **kwargs):
-    """EndBusyCursor()"""
-    return _misc_.EndBusyCursor(*args, **kwargs)
+def GetCurrentId(*args):
+  """GetCurrentId() -> long"""
+  return _misc_.GetCurrentId(*args)

 
 

-def GetElapsedTime(*args, **kwargs):
-    """GetElapsedTime(bool resetTimer=True) -> long"""
-    return _misc_.GetElapsedTime(*args, **kwargs)
+def IsStockID(*args, **kwargs):
+  """IsStockID(int id) -> bool"""
+  return _misc_.IsStockID(*args, **kwargs)

 
 

-def GetMousePosition(*args, **kwargs):
-    """GetMousePosition() -> (x,y)"""
-    return _misc_.GetMousePosition(*args, **kwargs)
+def IsStockLabel(*args, **kwargs):
+  """IsStockLabel(int id, String label) -> bool"""
+  return _misc_.IsStockLabel(*args, **kwargs)

 
 

-def IsBusy(*args, **kwargs):
-    """IsBusy() -> bool"""
-    return _misc_.IsBusy(*args, **kwargs)
+def GetStockLabel(*args, **kwargs):
+  """GetStockLabel(int id, bool withCodes=True, String accelerator=EmptyString) -> String"""
+  return _misc_.GetStockLabel(*args, **kwargs)

 
 

-def Now(*args, **kwargs):
-    """Now() -> String"""
-    return _misc_.Now(*args, **kwargs)
+def Bell(*args):
+  """Bell()"""
+  return _misc_.Bell(*args)

 
 

-def Shell(*args, **kwargs):
-    """Shell(String command=EmptyString) -> bool"""
-    return _misc_.Shell(*args, **kwargs)
+def EndBusyCursor(*args):
+  """EndBusyCursor()"""
+  return _misc_.EndBusyCursor(*args)

 
 

-def StartTimer(*args, **kwargs):
-    """StartTimer()"""
-    return _misc_.StartTimer(*args, **kwargs)
+def GetElapsedTime(*args, **kwargs):
+  """GetElapsedTime(bool resetTimer=True) -> long"""
+  return _misc_.GetElapsedTime(*args, **kwargs)
+GetElapsedTime = wx._deprecated(GetElapsedTime) 

 
 

-def GetOsVersion(*args, **kwargs):
-    """GetOsVersion() -> (platform, major, minor)"""
-    return _misc_.GetOsVersion(*args, **kwargs)
+def IsBusy(*args):
+  """IsBusy() -> bool"""
+  return _misc_.IsBusy(*args)

 
 

-def GetOsDescription(*args, **kwargs):
-    """GetOsDescription() -> String"""
-    return _misc_.GetOsDescription(*args, **kwargs)
+def Now(*args):
+  """Now() -> String"""
+  return _misc_.Now(*args)

 
 

-def GetFreeMemory(*args, **kwargs):
-    """GetFreeMemory() -> long"""
-    return _misc_.GetFreeMemory(*args, **kwargs)
+def Shell(*args, **kwargs):
+  """Shell(String command=EmptyString) -> bool"""
+  return _misc_.Shell(*args, **kwargs)
+
+def StartTimer(*args):
+  """StartTimer()"""
+  return _misc_.StartTimer(*args)
+UNKNOWN_PLATFORM = _misc_.UNKNOWN_PLATFORM
+CURSES = _misc_.CURSES
+XVIEW_X = _misc_.XVIEW_X
+MOTIF_X = _misc_.MOTIF_X
+COSE_X = _misc_.COSE_X
+NEXTSTEP = _misc_.NEXTSTEP
+MAC = _misc_.MAC
+MAC_DARWIN = _misc_.MAC_DARWIN
+BEOS = _misc_.BEOS
+GTK = _misc_.GTK
+GTK_WIN32 = _misc_.GTK_WIN32
+GTK_OS2 = _misc_.GTK_OS2
+GTK_BEOS = _misc_.GTK_BEOS
+GEOS = _misc_.GEOS
+OS2_PM = _misc_.OS2_PM
+WINDOWS = _misc_.WINDOWS
+MICROWINDOWS = _misc_.MICROWINDOWS
+PENWINDOWS = _misc_.PENWINDOWS
+WINDOWS_NT = _misc_.WINDOWS_NT
+WIN32S = _misc_.WIN32S
+WIN95 = _misc_.WIN95
+WIN386 = _misc_.WIN386
+WINDOWS_CE = _misc_.WINDOWS_CE
+WINDOWS_POCKETPC = _misc_.WINDOWS_POCKETPC
+WINDOWS_SMARTPHONE = _misc_.WINDOWS_SMARTPHONE
+MGL_UNIX = _misc_.MGL_UNIX
+MGL_X = _misc_.MGL_X
+MGL_WIN32 = _misc_.MGL_WIN32
+MGL_OS2 = _misc_.MGL_OS2
+MGL_DOS = _misc_.MGL_DOS
+WINDOWS_OS2 = _misc_.WINDOWS_OS2
+UNIX = _misc_.UNIX
+X11 = _misc_.X11
+PALMOS = _misc_.PALMOS
+DOS = _misc_.DOS
+
+def GetOsVersion(*args):
+  """GetOsVersion() -> (platform, major, minor)"""
+  return _misc_.GetOsVersion(*args)
+
+def GetOsDescription(*args):
+  """GetOsDescription() -> String"""
+  return _misc_.GetOsDescription(*args)
+
+def GetFreeMemory(*args):
+  """GetFreeMemory() -> wxMemorySize"""
+  return _misc_.GetFreeMemory(*args)

 SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT
 
 def Shutdown(*args, **kwargs):
 SHUTDOWN_POWEROFF = _misc_.SHUTDOWN_POWEROFF
 SHUTDOWN_REBOOT = _misc_.SHUTDOWN_REBOOT
 
 def Shutdown(*args, **kwargs):

-    """Shutdown(int wFlags) -> bool"""
-    return _misc_.Shutdown(*args, **kwargs)
+  """Shutdown(int wFlags) -> bool"""
+  return _misc_.Shutdown(*args, **kwargs)

 
 def Sleep(*args, **kwargs):
 
 def Sleep(*args, **kwargs):

-    """Sleep(int secs)"""
-    return _misc_.Sleep(*args, **kwargs)
+  """Sleep(int secs)"""
+  return _misc_.Sleep(*args, **kwargs)
+
+def MilliSleep(*args, **kwargs):
+  """MilliSleep(unsigned long milliseconds)"""
+  return _misc_.MilliSleep(*args, **kwargs)

 
 

-def Usleep(*args, **kwargs):
-    """Usleep(unsigned long milliseconds)"""
-    return _misc_.Usleep(*args, **kwargs)
+def MicroSleep(*args, **kwargs):
+  """MicroSleep(unsigned long microseconds)"""
+  return _misc_.MicroSleep(*args, **kwargs)
+Usleep = MilliSleep 

 
 def EnableTopLevelWindows(*args, **kwargs):
 
 def EnableTopLevelWindows(*args, **kwargs):

-    """EnableTopLevelWindows(bool enable)"""
-    return _misc_.EnableTopLevelWindows(*args, **kwargs)
+  """EnableTopLevelWindows(bool enable)"""
+  return _misc_.EnableTopLevelWindows(*args, **kwargs)

 
 def StripMenuCodes(*args, **kwargs):
 
 def StripMenuCodes(*args, **kwargs):

-    """StripMenuCodes(String in) -> String"""
-    return _misc_.StripMenuCodes(*args, **kwargs)
+  """StripMenuCodes(String in) -> String"""
+  return _misc_.StripMenuCodes(*args, **kwargs)

 
 

-def GetEmailAddress(*args, **kwargs):
-    """GetEmailAddress() -> String"""
-    return _misc_.GetEmailAddress(*args, **kwargs)
+def GetEmailAddress(*args):
+  """GetEmailAddress() -> String"""
+  return _misc_.GetEmailAddress(*args)

 
 

-def GetHostName(*args, **kwargs):
-    """GetHostName() -> String"""
-    return _misc_.GetHostName(*args, **kwargs)
+def GetHostName(*args):
+  """GetHostName() -> String"""
+  return _misc_.GetHostName(*args)

 
 

-def GetFullHostName(*args, **kwargs):
-    """GetFullHostName() -> String"""
-    return _misc_.GetFullHostName(*args, **kwargs)
+def GetFullHostName(*args):
+  """GetFullHostName() -> String"""
+  return _misc_.GetFullHostName(*args)

 
 

-def GetUserId(*args, **kwargs):
-    """GetUserId() -> String"""
-    return _misc_.GetUserId(*args, **kwargs)
+def GetUserId(*args):
+  """GetUserId() -> String"""
+  return _misc_.GetUserId(*args)

 
 

-def GetUserName(*args, **kwargs):
-    """GetUserName() -> String"""
-    return _misc_.GetUserName(*args, **kwargs)
+def GetUserName(*args):
+  """GetUserName() -> String"""
+  return _misc_.GetUserName(*args)

 
 

-def GetHomeDir(*args, **kwargs):
-    """GetHomeDir() -> String"""
-    return _misc_.GetHomeDir(*args, **kwargs)
+def GetHomeDir(*args):
+  """GetHomeDir() -> String"""
+  return _misc_.GetHomeDir(*args)

 
 def GetUserHome(*args, **kwargs):
 
 def GetUserHome(*args, **kwargs):

-    """GetUserHome(String user=EmptyString) -> String"""
-    return _misc_.GetUserHome(*args, **kwargs)
+  """GetUserHome(String user=EmptyString) -> String"""
+  return _misc_.GetUserHome(*args, **kwargs)

 
 

-def GetProcessId(*args, **kwargs):
-    """GetProcessId() -> unsigned long"""
-    return _misc_.GetProcessId(*args, **kwargs)
+def GetProcessId(*args):
+  """GetProcessId() -> unsigned long"""
+  return _misc_.GetProcessId(*args)

 
 

-def Trap(*args, **kwargs):
-    """Trap()"""
-    return _misc_.Trap(*args, **kwargs)
+def Trap(*args):
+  """Trap()"""
+  return _misc_.Trap(*args)

 
 def FileSelector(*args, **kwargs):
 
 def FileSelector(*args, **kwargs):

-    """
+  """

     FileSelector(String message=FileSelectorPromptStr, String default_path=EmptyString, 
         String default_filename=EmptyString, 
         String default_extension=EmptyString, 
     FileSelector(String message=FileSelectorPromptStr, String default_path=EmptyString, 
         String default_filename=EmptyString, 
         String default_extension=EmptyString, 


@@ -352,201 +448,338 @@ def FileSelector(*args, **kwargs):
         int flags=0, Window parent=None, int x=-1, 
         int y=-1) -> String
     """
         int flags=0, Window parent=None, int x=-1, 
         int y=-1) -> String
     """

-    return _misc_.FileSelector(*args, **kwargs)
+  return _misc_.FileSelector(*args, **kwargs)

 
 def LoadFileSelector(*args, **kwargs):
 
 def LoadFileSelector(*args, **kwargs):

-    """
+  """

     LoadFileSelector(String what, String extension, String default_name=EmptyString, 
         Window parent=None) -> String
     """
     LoadFileSelector(String what, String extension, String default_name=EmptyString, 
         Window parent=None) -> String
     """

-    return _misc_.LoadFileSelector(*args, **kwargs)
+  return _misc_.LoadFileSelector(*args, **kwargs)

 
 def SaveFileSelector(*args, **kwargs):
 
 def SaveFileSelector(*args, **kwargs):

-    """
+  """

     SaveFileSelector(String what, String extension, String default_name=EmptyString, 
         Window parent=None) -> String
     """
     SaveFileSelector(String what, String extension, String default_name=EmptyString, 
         Window parent=None) -> String
     """

-    return _misc_.SaveFileSelector(*args, **kwargs)
+  return _misc_.SaveFileSelector(*args, **kwargs)

 
 def DirSelector(*args, **kwargs):
 
 def DirSelector(*args, **kwargs):

-    """
+  """

     DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 
     DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 

-        long style=DD_DEFAULT_STYLE, 
+        long style=wxDD_DEFAULT_STYLE, 

         Point pos=DefaultPosition, Window parent=None) -> String
     """
         Point pos=DefaultPosition, Window parent=None) -> String
     """

-    return _misc_.DirSelector(*args, **kwargs)
+  return _misc_.DirSelector(*args, **kwargs)

 
 def GetTextFromUser(*args, **kwargs):
 
 def GetTextFromUser(*args, **kwargs):

-    """
+  """

     GetTextFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
         Window parent=None, 
         int x=-1, int y=-1, bool centre=True) -> String
     """
     GetTextFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
         Window parent=None, 
         int x=-1, int y=-1, bool centre=True) -> String
     """

-    return _misc_.GetTextFromUser(*args, **kwargs)
+  return _misc_.GetTextFromUser(*args, **kwargs)

 
 def GetPasswordFromUser(*args, **kwargs):
 
 def GetPasswordFromUser(*args, **kwargs):

-    """
+  """

     GetPasswordFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
         Window parent=None) -> String
     """
     GetPasswordFromUser(String message, String caption=EmptyString, String default_value=EmptyString, 
         Window parent=None) -> String
     """

-    return _misc_.GetPasswordFromUser(*args, **kwargs)
+  return _misc_.GetPasswordFromUser(*args, **kwargs)

 
 def GetSingleChoice(*args, **kwargs):
 
 def GetSingleChoice(*args, **kwargs):

+  """
+    GetSingleChoice(String message, String caption, int choices, Window parent=None, 
+        int x=-1, int y=-1, bool centre=True, 
+        int width=150, int height=200) -> String

     """
     """

-    GetSingleChoice(String message, String caption, int choices, String choices_array, 
-        Window parent=None, int x=-1, 
-        int y=-1, bool centre=True, int width=150, int height=200) -> String
-    """
-    return _misc_.GetSingleChoice(*args, **kwargs)
+  return _misc_.GetSingleChoice(*args, **kwargs)

 
 def GetSingleChoiceIndex(*args, **kwargs):
 
 def GetSingleChoiceIndex(*args, **kwargs):

+  """
+    GetSingleChoiceIndex(String message, String caption, int choices, Window parent=None, 
+        int x=-1, int y=-1, bool centre=True, 
+        int width=150, int height=200) -> int

     """
     """

-    GetSingleChoiceIndex(String message, String caption, int choices, String choices_array, 
-        Window parent=None, int x=-1, 
-        int y=-1, bool centre=True, int width=150, int height=200) -> int
-    """
-    return _misc_.GetSingleChoiceIndex(*args, **kwargs)
+  return _misc_.GetSingleChoiceIndex(*args, **kwargs)

 
 def MessageBox(*args, **kwargs):
 
 def MessageBox(*args, **kwargs):

-    """
+  """

     MessageBox(String message, String caption=EmptyString, int style=wxOK|wxCENTRE, 
         Window parent=None, int x=-1, 
         int y=-1) -> int
     """
     MessageBox(String message, String caption=EmptyString, int style=wxOK|wxCENTRE, 
         Window parent=None, int x=-1, 
         int y=-1) -> int
     """

-    return _misc_.MessageBox(*args, **kwargs)
-
-def GetNumberFromUser(*args, **kwargs):
-    """
-    GetNumberFromUser(String message, String prompt, String caption, long value, 
-        long min=0, long max=100, Window parent=None, 
-        Point pos=DefaultPosition) -> long
-    """
-    return _misc_.GetNumberFromUser(*args, **kwargs)
+  return _misc_.MessageBox(*args, **kwargs)

 
 

-def ColourDisplay(*args, **kwargs):
-    """ColourDisplay() -> bool"""
-    return _misc_.ColourDisplay(*args, **kwargs)
+def ColourDisplay(*args):
+  """ColourDisplay() -> bool"""
+  return _misc_.ColourDisplay(*args)

 
 

-def DisplayDepth(*args, **kwargs):
-    """DisplayDepth() -> int"""
-    return _misc_.DisplayDepth(*args, **kwargs)
+def DisplayDepth(*args):
+  """DisplayDepth() -> int"""
+  return _misc_.DisplayDepth(*args)

 
 

-def GetDisplayDepth(*args, **kwargs):
-    """GetDisplayDepth() -> int"""
-    return _misc_.GetDisplayDepth(*args, **kwargs)
+def GetDisplayDepth(*args):
+  """GetDisplayDepth() -> int"""
+  return _misc_.GetDisplayDepth(*args)

 
 

-def DisplaySize(*args, **kwargs):
-    """DisplaySize() -> (width, height)"""
-    return _misc_.DisplaySize(*args, **kwargs)
+def DisplaySize(*args):
+  """DisplaySize() -> (width, height)"""
+  return _misc_.DisplaySize(*args)

 
 

-def GetDisplaySize(*args, **kwargs):
-    """GetDisplaySize() -> Size"""
-    return _misc_.GetDisplaySize(*args, **kwargs)
+def GetDisplaySize(*args):
+  """GetDisplaySize() -> Size"""
+  return _misc_.GetDisplaySize(*args)

 
 

-def DisplaySizeMM(*args, **kwargs):
-    """DisplaySizeMM() -> (width, height)"""
-    return _misc_.DisplaySizeMM(*args, **kwargs)
+def DisplaySizeMM(*args):
+  """DisplaySizeMM() -> (width, height)"""
+  return _misc_.DisplaySizeMM(*args)

 
 

-def GetDisplaySizeMM(*args, **kwargs):
-    """GetDisplaySizeMM() -> Size"""
-    return _misc_.GetDisplaySizeMM(*args, **kwargs)
+def GetDisplaySizeMM(*args):
+  """GetDisplaySizeMM() -> Size"""
+  return _misc_.GetDisplaySizeMM(*args)

 
 

-def ClientDisplayRect(*args, **kwargs):
-    """ClientDisplayRect() -> (x, y, width, height)"""
-    return _misc_.ClientDisplayRect(*args, **kwargs)
+def ClientDisplayRect(*args):
+  """ClientDisplayRect() -> (x, y, width, height)"""
+  return _misc_.ClientDisplayRect(*args)

 
 

-def GetClientDisplayRect(*args, **kwargs):
-    """GetClientDisplayRect() -> Rect"""
-    return _misc_.GetClientDisplayRect(*args, **kwargs)
+def GetClientDisplayRect(*args):
+  """GetClientDisplayRect() -> Rect"""
+  return _misc_.GetClientDisplayRect(*args)

 
 def SetCursor(*args, **kwargs):
 
 def SetCursor(*args, **kwargs):

-    """SetCursor(Cursor cursor)"""
-    return _misc_.SetCursor(*args, **kwargs)
+  """SetCursor(Cursor cursor)"""
+  return _misc_.SetCursor(*args, **kwargs)
+
+def GetXDisplay(*args):
+  """
+    GetXDisplay() -> void
+
+    Returns a swigified pointer to the X11 display.  Returns None on
+    other platforms.
+    """
+  return _misc_.GetXDisplay(*args)

 
 def BeginBusyCursor(*args, **kwargs):
 
 def BeginBusyCursor(*args, **kwargs):

-    """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""
-    return _misc_.BeginBusyCursor(*args, **kwargs)
+  """BeginBusyCursor(Cursor cursor=wxHOURGLASS_CURSOR)"""
+  return _misc_.BeginBusyCursor(*args, **kwargs)
+
+def GetMousePosition(*args):
+  """
+    GetMousePosition() -> Point
+
+    Get the current mouse position on the screen.
+    """
+  return _misc_.GetMousePosition(*args)

 
 

-def GetActiveWindow(*args, **kwargs):
-    """GetActiveWindow() -> Window"""
-    return _misc_.GetActiveWindow(*args, **kwargs)
+def FindWindowAtPointer(*args):
+  """
+    FindWindowAtPointer() -> Window
+
+    Returns the window currently under the mouse pointer, if it belongs to
+        this application.  Otherwise it returns None.
+    """
+  return _misc_.FindWindowAtPointer(*args)
+
+def GetActiveWindow(*args):
+  """
+    GetActiveWindow() -> Window
+
+    Get the currently active window of this application, or None
+    """
+  return _misc_.GetActiveWindow(*args)

 
 def GenericFindWindowAtPoint(*args, **kwargs):
 
 def GenericFindWindowAtPoint(*args, **kwargs):

-    """GenericFindWindowAtPoint(Point pt) -> Window"""
-    return _misc_.GenericFindWindowAtPoint(*args, **kwargs)
+  """GenericFindWindowAtPoint(Point pt) -> Window"""
+  return _misc_.GenericFindWindowAtPoint(*args, **kwargs)

 
 def FindWindowAtPoint(*args, **kwargs):
 
 def FindWindowAtPoint(*args, **kwargs):

-    """FindWindowAtPoint(Point pt) -> Window"""
-    return _misc_.FindWindowAtPoint(*args, **kwargs)
+  """FindWindowAtPoint(Point pt) -> Window"""
+  return _misc_.FindWindowAtPoint(*args, **kwargs)

 
 def GetTopLevelParent(*args, **kwargs):
 
 def GetTopLevelParent(*args, **kwargs):

-    """GetTopLevelParent(Window win) -> Window"""
-    return _misc_.GetTopLevelParent(*args, **kwargs)
+  """GetTopLevelParent(Window win) -> Window"""
+  return _misc_.GetTopLevelParent(*args, **kwargs)

 
 

-def GetKeyState(*args, **kwargs):
+def LaunchDefaultBrowser(*args, **kwargs):
+  """
+    LaunchDefaultBrowser(String url) -> bool
+
+    Launches the user's default browser and tells it to open the location
+    at ``url``.  Returns ``True`` if the application was successfully
+    launched.

     """
     """

+  return _misc_.LaunchDefaultBrowser(*args, **kwargs)
+
+def GetKeyState(*args, **kwargs):
+  """

     GetKeyState(int key) -> bool
 
     Get the state of a key (true if pressed or toggled on, false if not.)
     This is generally most useful getting the state of the modifier or
     GetKeyState(int key) -> bool
 
     Get the state of a key (true if pressed or toggled on, false if not.)
     This is generally most useful getting the state of the modifier or

-    toggle keys.  On some platforms those may be the only keys that work.
+    toggle keys.  On some platforms those may be the only keys that this
+    function is able to detect.
+
+    """
+  return _misc_.GetKeyState(*args, **kwargs)
+class MouseState(object):
+    """
+    `wx.MouseState` is used to hold information about mouse button and
+    modifier key states and is what is returned from `wx.GetMouseState`.
+    """
+    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) -> MouseState
+
+        `wx.MouseState` is used to hold information about mouse button and
+        modifier key states and is what is returned from `wx.GetMouseState`.
+        """
+        _misc_.MouseState_swiginit(self,_misc_.new_MouseState(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_MouseState
+    __del__ = lambda self : None;
+    def GetX(*args, **kwargs):
+        """GetX(self) -> int"""
+        return _misc_.MouseState_GetX(*args, **kwargs)
+
+    def GetY(*args, **kwargs):
+        """GetY(self) -> int"""
+        return _misc_.MouseState_GetY(*args, **kwargs)
+
+    def LeftDown(*args, **kwargs):
+        """LeftDown(self) -> bool"""
+        return _misc_.MouseState_LeftDown(*args, **kwargs)
+
+    def MiddleDown(*args, **kwargs):
+        """MiddleDown(self) -> bool"""
+        return _misc_.MouseState_MiddleDown(*args, **kwargs)
+
+    def RightDown(*args, **kwargs):
+        """RightDown(self) -> bool"""
+        return _misc_.MouseState_RightDown(*args, **kwargs)
+
+    def ControlDown(*args, **kwargs):
+        """ControlDown(self) -> bool"""
+        return _misc_.MouseState_ControlDown(*args, **kwargs)
+
+    def ShiftDown(*args, **kwargs):
+        """ShiftDown(self) -> bool"""
+        return _misc_.MouseState_ShiftDown(*args, **kwargs)
+
+    def AltDown(*args, **kwargs):
+        """AltDown(self) -> bool"""
+        return _misc_.MouseState_AltDown(*args, **kwargs)
+
+    def MetaDown(*args, **kwargs):
+        """MetaDown(self) -> bool"""
+        return _misc_.MouseState_MetaDown(*args, **kwargs)
+
+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _misc_.MouseState_CmdDown(*args, **kwargs)
+
+    def SetX(*args, **kwargs):
+        """SetX(self, int x)"""
+        return _misc_.MouseState_SetX(*args, **kwargs)
+
+    def SetY(*args, **kwargs):
+        """SetY(self, int y)"""
+        return _misc_.MouseState_SetY(*args, **kwargs)
+
+    def SetLeftDown(*args, **kwargs):
+        """SetLeftDown(self, bool down)"""
+        return _misc_.MouseState_SetLeftDown(*args, **kwargs)
+
+    def SetMiddleDown(*args, **kwargs):
+        """SetMiddleDown(self, bool down)"""
+        return _misc_.MouseState_SetMiddleDown(*args, **kwargs)
+
+    def SetRightDown(*args, **kwargs):
+        """SetRightDown(self, bool down)"""
+        return _misc_.MouseState_SetRightDown(*args, **kwargs)
+
+    def SetControlDown(*args, **kwargs):
+        """SetControlDown(self, bool down)"""
+        return _misc_.MouseState_SetControlDown(*args, **kwargs)
+
+    def SetShiftDown(*args, **kwargs):
+        """SetShiftDown(self, bool down)"""
+        return _misc_.MouseState_SetShiftDown(*args, **kwargs)
+
+    def SetAltDown(*args, **kwargs):
+        """SetAltDown(self, bool down)"""
+        return _misc_.MouseState_SetAltDown(*args, **kwargs)
+
+    def SetMetaDown(*args, **kwargs):
+        """SetMetaDown(self, bool down)"""
+        return _misc_.MouseState_SetMetaDown(*args, **kwargs)
+
+    x = property(GetX, SetX)
+    y = property(GetY, SetY)
+    leftDown = property(LeftDown, SetLeftDown)
+    middleDown = property(MiddleDown, SetMiddleDown)
+    rightDown = property(RightDown, SetRightDown)
+    controlDown = property(ControlDown, SetControlDown)
+    shiftDown = property(ShiftDown, SetShiftDown)
+    altDown = property(AltDown, SetAltDown)
+    metaDown = property(MetaDown, SetMetaDown)
+    cmdDown = property(CmdDown)
+
+_misc_.MouseState_swigregister(MouseState)
+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr
+

 
 

+def GetMouseState(*args):
+  """
+    GetMouseState() -> MouseState
+
+    Returns the current state of the mouse.  Returns an instance of a
+    `wx.MouseState` object that contains the current position of the mouse
+    pointer in screen coordinants, as well as boolean values indicating
+    the up/down status of the mouse buttons and the modifier keys.

     """
     """

-    return _misc_.GetKeyState(*args, **kwargs)
+  return _misc_.GetMouseState(*args)

 
 

-def WakeUpMainThread(*args, **kwargs):
-    """WakeUpMainThread()"""
-    return _misc_.WakeUpMainThread(*args, **kwargs)
+def WakeUpMainThread(*args):
+  """WakeUpMainThread()"""
+  return _misc_.WakeUpMainThread(*args)

 
 

-def MutexGuiEnter(*args, **kwargs):
-    """MutexGuiEnter()"""
-    return _misc_.MutexGuiEnter(*args, **kwargs)
+def MutexGuiEnter(*args):
+  """MutexGuiEnter()"""
+  return _misc_.MutexGuiEnter(*args)

 
 

-def MutexGuiLeave(*args, **kwargs):
-    """MutexGuiLeave()"""
-    return _misc_.MutexGuiLeave(*args, **kwargs)
+def MutexGuiLeave(*args):
+  """MutexGuiLeave()"""
+  return _misc_.MutexGuiLeave(*args)

 class MutexGuiLocker(object):
 class MutexGuiLocker(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMutexGuiLocker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ MutexGuiLocker class"""
+    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) -> MutexGuiLocker"""
         """__init__(self) -> MutexGuiLocker"""

-        newobj = _misc_.new_MutexGuiLocker(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_MutexGuiLocker):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class MutexGuiLockerPtr(MutexGuiLocker):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MutexGuiLocker
-_misc_.MutexGuiLocker_swigregister(MutexGuiLockerPtr)
-cvar = _misc_.cvar
-FileSelectorPromptStr = cvar.FileSelectorPromptStr
-FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
-DirSelectorPromptStr = cvar.DirSelectorPromptStr
+        _misc_.MutexGuiLocker_swiginit(self,_misc_.new_MutexGuiLocker(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_MutexGuiLocker
+    __del__ = lambda self : None;
+_misc_.MutexGuiLocker_swigregister(MutexGuiLocker)

 
 
 
 

-def Thread_IsMain(*args, **kwargs):
-    """Thread_IsMain() -> bool"""
-    return _misc_.Thread_IsMain(*args, **kwargs)
+def Thread_IsMain(*args):
+  """Thread_IsMain() -> bool"""
+  return _misc_.Thread_IsMain(*args)

 #---------------------------------------------------------------------------
 
 class ToolTip(_core.Object):
 #---------------------------------------------------------------------------
 
 class ToolTip(_core.Object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxToolTip instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ ToolTip class"""
+    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 tip) -> ToolTip"""
         """__init__(self, String tip) -> ToolTip"""

-        newobj = _misc_.new_ToolTip(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.ToolTip_swiginit(self,_misc_.new_ToolTip(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_ToolTip
+    __del__ = lambda self : None;

     def SetTip(*args, **kwargs):
         """SetTip(self, String tip)"""
         return _misc_.ToolTip_SetTip(*args, **kwargs)
     def SetTip(*args, **kwargs):
         """SetTip(self, String tip)"""
         return _misc_.ToolTip_SetTip(*args, **kwargs)


@@ -569,36 +802,34 @@ class ToolTip(_core.Object):
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)

-
-class ToolTipPtr(ToolTip):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ToolTip
-_misc_.ToolTip_swigregister(ToolTipPtr)
+_misc_.ToolTip_swigregister(ToolTip)

 
 def ToolTip_Enable(*args, **kwargs):
 
 def ToolTip_Enable(*args, **kwargs):

-    """ToolTip_Enable(bool flag)"""
-    return _misc_.ToolTip_Enable(*args, **kwargs)
+  """ToolTip_Enable(bool flag)"""
+  return _misc_.ToolTip_Enable(*args, **kwargs)

 
 def ToolTip_SetDelay(*args, **kwargs):
 
 def ToolTip_SetDelay(*args, **kwargs):

-    """ToolTip_SetDelay(long milliseconds)"""
-    return _misc_.ToolTip_SetDelay(*args, **kwargs)
+  """ToolTip_SetDelay(long milliseconds)"""
+  return _misc_.ToolTip_SetDelay(*args, **kwargs)

 
 class Caret(object):
 
 class Caret(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCaret instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ Caret class"""
+    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 window, Size size) -> Caret"""
         """__init__(self, Window window, Size size) -> Caret"""

-        newobj = _misc_.new_Caret(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Caret):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
+        _misc_.Caret_swiginit(self,_misc_.new_Caret(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Caret
+    __del__ = lambda self : None;
+    def Destroy(*args, **kwargs):
+        """
+        Destroy(self)
+
+        Deletes the C++ object this Python object is a proxy for.
+        """
+        val = _misc_.Caret_Destroy(*args, **kwargs)
+        args[0].thisown = 0
+        return val

 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""


@@ -653,100 +884,67 @@ class Caret(object):
         return _misc_.Caret_Hide(*args, **kwargs)
 
     def __nonzero__(self): return self.IsOk() 
         return _misc_.Caret_Hide(*args, **kwargs)
 
     def __nonzero__(self): return self.IsOk() 

+    def GetBlinkTime(*args, **kwargs):
+        """GetBlinkTime() -> int"""
+        return _misc_.Caret_GetBlinkTime(*args, **kwargs)

 
 

-class CaretPtr(Caret):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Caret
-_misc_.Caret_swigregister(CaretPtr)
+    GetBlinkTime = staticmethod(GetBlinkTime)
+    def SetBlinkTime(*args, **kwargs):
+        """SetBlinkTime(int milliseconds)"""
+        return _misc_.Caret_SetBlinkTime(*args, **kwargs)

 
 

+    SetBlinkTime = staticmethod(SetBlinkTime)
+_misc_.Caret_swigregister(Caret)

 
 

-def Caret_GetBlinkTime(*args, **kwargs):
-    """Caret_GetBlinkTime() -> int"""
-    return _misc_.Caret_GetBlinkTime(*args, **kwargs)
+def Caret_GetBlinkTime(*args):
+  """Caret_GetBlinkTime() -> int"""
+  return _misc_.Caret_GetBlinkTime(*args)

 
 def Caret_SetBlinkTime(*args, **kwargs):
 
 def Caret_SetBlinkTime(*args, **kwargs):

-    """Caret_SetBlinkTime(int milliseconds)"""
-    return _misc_.Caret_SetBlinkTime(*args, **kwargs)
+  """Caret_SetBlinkTime(int milliseconds)"""
+  return _misc_.Caret_SetBlinkTime(*args, **kwargs)
+

 class BusyCursor(object):
 class BusyCursor(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBusyCursor instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ BusyCursor class"""
+    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, Cursor cursor=wxHOURGLASS_CURSOR) -> BusyCursor"""
         """__init__(self, Cursor cursor=wxHOURGLASS_CURSOR) -> BusyCursor"""

-        newobj = _misc_.new_BusyCursor(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_BusyCursor):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class BusyCursorPtr(BusyCursor):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = BusyCursor
-_misc_.BusyCursor_swigregister(BusyCursorPtr)
+        _misc_.BusyCursor_swiginit(self,_misc_.new_BusyCursor(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_BusyCursor
+    __del__ = lambda self : None;
+_misc_.BusyCursor_swigregister(BusyCursor)

 
 class WindowDisabler(object):
 
 class WindowDisabler(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxWindowDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ WindowDisabler class"""
+    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 winToSkip=None) -> WindowDisabler"""
         """__init__(self, Window winToSkip=None) -> WindowDisabler"""

-        newobj = _misc_.new_WindowDisabler(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_WindowDisabler):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class WindowDisablerPtr(WindowDisabler):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = WindowDisabler
-_misc_.WindowDisabler_swigregister(WindowDisablerPtr)
+        _misc_.WindowDisabler_swiginit(self,_misc_.new_WindowDisabler(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_WindowDisabler
+    __del__ = lambda self : None;
+_misc_.WindowDisabler_swigregister(WindowDisabler)

 
 class BusyInfo(_core.Object):
 
 class BusyInfo(_core.Object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBusyInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ BusyInfo class"""
+    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 message) -> BusyInfo"""
         """__init__(self, String message) -> BusyInfo"""

-        newobj = _misc_.new_BusyInfo(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_BusyInfo):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class BusyInfoPtr(BusyInfo):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = BusyInfo
-_misc_.BusyInfo_swigregister(BusyInfoPtr)
+        _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_BusyInfo
+    __del__ = lambda self : None;
+    def Destroy(self): pass 
+_misc_.BusyInfo_swigregister(BusyInfo)

 
 class StopWatch(object):
 
 class StopWatch(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxStopWatch instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ StopWatch class"""
+    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) -> StopWatch"""
         """__init__(self) -> StopWatch"""

-        newobj = _misc_.new_StopWatch(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))

     def Start(*args, **kwargs):
         """Start(self, long t0=0)"""
         return _misc_.StopWatch_Start(*args, **kwargs)
     def Start(*args, **kwargs):
         """Start(self, long t0=0)"""
         return _misc_.StopWatch_Start(*args, **kwargs)


@@ -763,29 +961,17 @@ class StopWatch(object):
         """Time(self) -> long"""
         return _misc_.StopWatch_Time(*args, **kwargs)
 
         """Time(self) -> long"""
         return _misc_.StopWatch_Time(*args, **kwargs)
 

-
-class StopWatchPtr(StopWatch):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = StopWatch
-_misc_.StopWatch_swigregister(StopWatchPtr)
+_misc_.StopWatch_swigregister(StopWatch)

 
 class FileHistory(_core.Object):
 
 class FileHistory(_core.Object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, int maxFiles=9) -> FileHistory"""
-        newobj = _misc_.new_FileHistory(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_FileHistory):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    """Proxy of C++ FileHistory class"""
+    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 maxFiles=9, int idBase=ID_FILE1) -> FileHistory"""
+        _misc_.FileHistory_swiginit(self,_misc_.new_FileHistory(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_FileHistory
+    __del__ = lambda self : None;

     def AddFileToHistory(*args, **kwargs):
         """AddFileToHistory(self, String file)"""
         return _misc_.FileHistory_AddFileToHistory(*args, **kwargs)
     def AddFileToHistory(*args, **kwargs):
         """AddFileToHistory(self, String file)"""
         return _misc_.FileHistory_AddFileToHistory(*args, **kwargs)


@@ -831,29 +1017,17 @@ class FileHistory(_core.Object):
         return _misc_.FileHistory_GetCount(*args, **kwargs)
 
     GetNoHistoryFiles = GetCount 
         return _misc_.FileHistory_GetCount(*args, **kwargs)
 
     GetNoHistoryFiles = GetCount 

-
-class FileHistoryPtr(FileHistory):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileHistory
-_misc_.FileHistory_swigregister(FileHistoryPtr)
+_misc_.FileHistory_swigregister(FileHistory)

 
 class SingleInstanceChecker(object):
 
 class SingleInstanceChecker(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSingleInstanceChecker instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ SingleInstanceChecker class"""
+    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, String path=EmptyString) -> SingleInstanceChecker"""
         """__init__(self, String name, String path=EmptyString) -> SingleInstanceChecker"""

-        newobj = _misc_.new_SingleInstanceChecker(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_SingleInstanceChecker):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.SingleInstanceChecker_swiginit(self,_misc_.new_SingleInstanceChecker(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_SingleInstanceChecker
+    __del__ = lambda self : None;

     def Create(*args, **kwargs):
         """Create(self, String name, String path=EmptyString) -> bool"""
         return _misc_.SingleInstanceChecker_Create(*args, **kwargs)
     def Create(*args, **kwargs):
         """Create(self, String name, String path=EmptyString) -> bool"""
         return _misc_.SingleInstanceChecker_Create(*args, **kwargs)


@@ -862,36 +1036,26 @@ class SingleInstanceChecker(object):
         """IsAnotherRunning(self) -> bool"""
         return _misc_.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
 
         """IsAnotherRunning(self) -> bool"""
         return _misc_.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
 

-
-class SingleInstanceCheckerPtr(SingleInstanceChecker):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = SingleInstanceChecker
-_misc_.SingleInstanceChecker_swigregister(SingleInstanceCheckerPtr)
+_misc_.SingleInstanceChecker_swigregister(SingleInstanceChecker)

 
 def PreSingleInstanceChecker(*args, **kwargs):
     """PreSingleInstanceChecker() -> SingleInstanceChecker"""
     val = _misc_.new_PreSingleInstanceChecker(*args, **kwargs)
 
 def PreSingleInstanceChecker(*args, **kwargs):
     """PreSingleInstanceChecker() -> SingleInstanceChecker"""
     val = _misc_.new_PreSingleInstanceChecker(*args, **kwargs)

-    val.thisown = 1

     return val
 
 
 def DrawWindowOnDC(*args, **kwargs):
     return val
 
 
 def DrawWindowOnDC(*args, **kwargs):

-    """DrawWindowOnDC(Window window, DC dc, int method)"""
-    return _misc_.DrawWindowOnDC(*args, **kwargs)
+  """DrawWindowOnDC(Window window, DC dc) -> bool"""
+  return _misc_.DrawWindowOnDC(*args, **kwargs)

 #---------------------------------------------------------------------------
 
 class TipProvider(object):
 #---------------------------------------------------------------------------
 
 class TipProvider(object):

-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __del__(self, destroy=_misc_.delete_TipProvider):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    """Proxy of C++ TipProvider class"""
+    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
+    __swig_destroy__ = _misc_.delete_TipProvider
+    __del__ = lambda self : None;

     def GetTip(*args, **kwargs):
         """GetTip(self) -> String"""
         return _misc_.TipProvider_GetTip(*args, **kwargs)
     def GetTip(*args, **kwargs):
         """GetTip(self) -> String"""
         return _misc_.TipProvider_GetTip(*args, **kwargs)


@@ -904,73 +1068,53 @@ class TipProvider(object):
         """PreprocessTip(self, String tip) -> String"""
         return _misc_.TipProvider_PreprocessTip(*args, **kwargs)
 
         """PreprocessTip(self, String tip) -> String"""
         return _misc_.TipProvider_PreprocessTip(*args, **kwargs)
 

-
-class TipProviderPtr(TipProvider):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TipProvider
-_misc_.TipProvider_swigregister(TipProviderPtr)
+_misc_.TipProvider_swigregister(TipProvider)

 
 class PyTipProvider(TipProvider):
 
 class PyTipProvider(TipProvider):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTipProvider instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ PyTipProvider class"""
+    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, size_t currentTip) -> PyTipProvider"""
         """__init__(self, size_t currentTip) -> PyTipProvider"""

-        newobj = _misc_.new_PyTipProvider(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.PyTipProvider_swiginit(self,_misc_.new_PyTipProvider(*args, **kwargs))

         self._setCallbackInfo(self, PyTipProvider)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTipProvider__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, PyTipProvider)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTipProvider__setCallbackInfo(*args, **kwargs)
 

-
-class PyTipProviderPtr(PyTipProvider):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyTipProvider
-_misc_.PyTipProvider_swigregister(PyTipProviderPtr)
+_misc_.PyTipProvider_swigregister(PyTipProvider)

 
 
 def ShowTip(*args, **kwargs):
 
 
 def ShowTip(*args, **kwargs):

-    """ShowTip(Window parent, TipProvider tipProvider, bool showAtStartup=True) -> bool"""
-    return _misc_.ShowTip(*args, **kwargs)
+  """ShowTip(Window parent, TipProvider tipProvider, bool showAtStartup=True) -> bool"""
+  return _misc_.ShowTip(*args, **kwargs)

 
 def CreateFileTipProvider(*args, **kwargs):
 
 def CreateFileTipProvider(*args, **kwargs):

-    """CreateFileTipProvider(String filename, size_t currentTip) -> TipProvider"""
-    return _misc_.CreateFileTipProvider(*args, **kwargs)
+  """CreateFileTipProvider(String filename, size_t currentTip) -> TipProvider"""
+  return _misc_.CreateFileTipProvider(*args, **kwargs)

 #---------------------------------------------------------------------------
 
 TIMER_CONTINUOUS = _misc_.TIMER_CONTINUOUS
 TIMER_ONE_SHOT = _misc_.TIMER_ONE_SHOT
 wxEVT_TIMER = _misc_.wxEVT_TIMER
 class Timer(_core.EvtHandler):
 #---------------------------------------------------------------------------
 
 TIMER_CONTINUOUS = _misc_.TIMER_CONTINUOUS
 TIMER_ONE_SHOT = _misc_.TIMER_ONE_SHOT
 wxEVT_TIMER = _misc_.wxEVT_TIMER
 class Timer(_core.EvtHandler):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTimer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
-        """__init__(self, EvtHandler owner=None, int id=-1) -> Timer"""
-        newobj = _misc_.new_Timer(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-        self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)
-
-    def __del__(self, destroy=_misc_.delete_Timer):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    """Proxy of C++ Timer class"""
+    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, EvtHandler owner=None, int id=ID_ANY) -> Timer"""
+        _misc_.Timer_swiginit(self,_misc_.new_Timer(*args, **kwargs))
+        self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self, 0)
+
+    __swig_destroy__ = _misc_.delete_Timer
+    __del__ = lambda self : None;

     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)"""
         return _misc_.Timer__setCallbackInfo(*args, **kwargs)
 
     def SetOwner(*args, **kwargs):
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)"""
         return _misc_.Timer__setCallbackInfo(*args, **kwargs)
 
     def SetOwner(*args, **kwargs):

-        """SetOwner(self, EvtHandler owner, int id=-1)"""
+        """SetOwner(self, EvtHandler owner, int id=ID_ANY)"""

         return _misc_.Timer_SetOwner(*args, **kwargs)
 
     def GetOwner(*args, **kwargs):
         return _misc_.Timer_SetOwner(*args, **kwargs)
 
     def GetOwner(*args, **kwargs):


@@ -985,6 +1129,10 @@ class Timer(_core.EvtHandler):
         """Stop(self)"""
         return _misc_.Timer_Stop(*args, **kwargs)
 
         """Stop(self)"""
         return _misc_.Timer_Stop(*args, **kwargs)
 

+    def Notify(*args, **kwargs):
+        """Notify(self)"""
+        return _misc_.Timer_Notify(*args, **kwargs)
+

     def IsRunning(*args, **kwargs):
         """IsRunning(self) -> bool"""
         return _misc_.Timer_IsRunning(*args, **kwargs)
     def IsRunning(*args, **kwargs):
         """IsRunning(self) -> bool"""
         return _misc_.Timer_IsRunning(*args, **kwargs)


@@ -993,21 +1141,19 @@ class Timer(_core.EvtHandler):
         """GetInterval(self) -> int"""
         return _misc_.Timer_GetInterval(*args, **kwargs)
 
         """GetInterval(self) -> int"""
         return _misc_.Timer_GetInterval(*args, **kwargs)
 

-    def IsOneShot(*args, **kwargs):
-        """IsOneShot(self) -> bool"""
-        return _misc_.Timer_IsOneShot(*args, **kwargs)
-

     def GetId(*args, **kwargs):
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 
     def GetId(*args, **kwargs):
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 

+    def IsOneShot(*args, **kwargs):
+        """IsOneShot(self) -> bool"""
+        return _misc_.Timer_IsOneShot(*args, **kwargs)
+
+    def Destroy(self):
+        """NO-OP: Timers must be destroyed by normal reference counting"""
+        pass

 
 

-class TimerPtr(Timer):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Timer
-_misc_.Timer_swigregister(TimerPtr)
+_misc_.Timer_swigregister(Timer)

 
 # For backwards compatibility with 2.4
 class PyTimer(Timer):
 
 # For backwards compatibility with 2.4
 class PyTimer(Timer):


@@ -1024,55 +1170,35 @@ EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
 
 
 class TimerEvent(_core.Event):
 
 
 class TimerEvent(_core.Event):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTimerEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ TimerEvent class"""
+    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 timerid=0, int interval=0) -> TimerEvent"""
         """__init__(self, int timerid=0, int interval=0) -> TimerEvent"""

-        newobj = _misc_.new_TimerEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.TimerEvent_swiginit(self,_misc_.new_TimerEvent(*args, **kwargs))

     def GetInterval(*args, **kwargs):
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 
     def GetInterval(*args, **kwargs):
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 

-
-class TimerEventPtr(TimerEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TimerEvent
-_misc_.TimerEvent_swigregister(TimerEventPtr)
+_misc_.TimerEvent_swigregister(TimerEvent)

 
 class TimerRunner(object):
 
 class TimerRunner(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTimerRunner instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args):
+    """Proxy of C++ TimerRunner class"""
+    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, wxTimer timer) -> TimerRunner
         __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner
         """
         """
         __init__(self, wxTimer timer) -> TimerRunner
         __init__(self, wxTimer timer, int milli, bool oneShot=False) -> TimerRunner
         """

-        newobj = _misc_.new_TimerRunner(*args)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_TimerRunner):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.TimerRunner_swiginit(self,_misc_.new_TimerRunner(*args))
+    __swig_destroy__ = _misc_.delete_TimerRunner
+    __del__ = lambda self : None;

     def Start(*args, **kwargs):
         """Start(self, int milli, bool oneShot=False)"""
         return _misc_.TimerRunner_Start(*args, **kwargs)
 
     def Start(*args, **kwargs):
         """Start(self, int milli, bool oneShot=False)"""
         return _misc_.TimerRunner_Start(*args, **kwargs)
 

-
-class TimerRunnerPtr(TimerRunner):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TimerRunner
-_misc_.TimerRunner_swigregister(TimerRunnerPtr)
+_misc_.TimerRunner_swigregister(TimerRunner)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -1098,14 +1224,14 @@ TraceResAlloc = _misc_.TraceResAlloc
 TraceRefCount = _misc_.TraceRefCount
 TraceOleCalls = _misc_.TraceOleCalls
 class Log(object):
 TraceRefCount = _misc_.TraceRefCount
 TraceOleCalls = _misc_.TraceOleCalls
 class Log(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ Log class"""
+    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) -> Log"""
         """__init__(self) -> Log"""

-        newobj = _misc_.new_Log(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.Log_swiginit(self,_misc_.new_Log(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Log
+    __del__ = lambda self : None;

     def IsEnabled(*args, **kwargs):
         """IsEnabled() -> bool"""
         return _misc_.Log_IsEnabled(*args, **kwargs)
     def IsEnabled(*args, **kwargs):
         """IsEnabled() -> bool"""
         return _misc_.Log_IsEnabled(*args, **kwargs)


@@ -1117,7 +1243,7 @@ class Log(object):
 
     EnableLogging = staticmethod(EnableLogging)
     def OnLog(*args, **kwargs):
 
     EnableLogging = staticmethod(EnableLogging)
     def OnLog(*args, **kwargs):

-        """OnLog(wxLogLevel level, wxChar szString, time_t t)"""
+        """OnLog(LogLevel level, wxChar szString, time_t t)"""

         return _misc_.Log_OnLog(*args, **kwargs)
 
     OnLog = staticmethod(OnLog)
         return _misc_.Log_OnLog(*args, **kwargs)
 
     OnLog = staticmethod(OnLog)


@@ -1156,7 +1282,7 @@ class Log(object):
 
     SetVerbose = staticmethod(SetVerbose)
     def SetLogLevel(*args, **kwargs):
 
     SetVerbose = staticmethod(SetVerbose)
     def SetLogLevel(*args, **kwargs):

-        """SetLogLevel(wxLogLevel logLevel)"""
+        """SetLogLevel(LogLevel logLevel)"""

         return _misc_.Log_SetLogLevel(*args, **kwargs)
 
     SetLogLevel = staticmethod(SetLogLevel)
         return _misc_.Log_SetLogLevel(*args, **kwargs)
 
     SetLogLevel = staticmethod(SetLogLevel)


@@ -1166,7 +1292,7 @@ class Log(object):
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetTraceMask(*args, **kwargs):
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetTraceMask(*args, **kwargs):

-        """SetTraceMask(wxTraceMask ulMask)"""
+        """SetTraceMask(TraceMask ulMask)"""

         return _misc_.Log_SetTraceMask(*args, **kwargs)
 
     SetTraceMask = staticmethod(SetTraceMask)
         return _misc_.Log_SetTraceMask(*args, **kwargs)
 
     SetTraceMask = staticmethod(SetTraceMask)


@@ -1201,7 +1327,7 @@ class Log(object):
 
     GetVerbose = staticmethod(GetVerbose)
     def GetTraceMask(*args, **kwargs):
 
     GetVerbose = staticmethod(GetVerbose)
     def GetTraceMask(*args, **kwargs):

-        """GetTraceMask() -> wxTraceMask"""
+        """GetTraceMask() -> TraceMask"""

         return _misc_.Log_GetTraceMask(*args, **kwargs)
 
     GetTraceMask = staticmethod(GetTraceMask)
         return _misc_.Log_GetTraceMask(*args, **kwargs)
 
     GetTraceMask = staticmethod(GetTraceMask)


@@ -1211,7 +1337,7 @@ class Log(object):
 
     IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
     def GetLogLevel(*args, **kwargs):
 
     IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
     def GetLogLevel(*args, **kwargs):

-        """GetLogLevel() -> wxLogLevel"""
+        """GetLogLevel() -> LogLevel"""

         return _misc_.Log_GetLogLevel(*args, **kwargs)
 
     GetLogLevel = staticmethod(GetLogLevel)
         return _misc_.Log_GetLogLevel(*args, **kwargs)
 
     GetLogLevel = staticmethod(GetLogLevel)


@@ -1227,168 +1353,138 @@ class Log(object):
     TimeStamp = staticmethod(TimeStamp)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
     TimeStamp = staticmethod(TimeStamp)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""

-        return _misc_.Log_Destroy(*args, **kwargs)
-
+        val = _misc_.Log_Destroy(*args, **kwargs)
+        args[0].thisown = 0
+        return val

 
 

-class LogPtr(Log):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Log
-_misc_.Log_swigregister(LogPtr)
+_misc_.Log_swigregister(Log)

 
 

-def Log_IsEnabled(*args, **kwargs):
-    """Log_IsEnabled() -> bool"""
-    return _misc_.Log_IsEnabled(*args, **kwargs)
+def Log_IsEnabled(*args):
+  """Log_IsEnabled() -> bool"""
+  return _misc_.Log_IsEnabled(*args)

 
 def Log_EnableLogging(*args, **kwargs):
 
 def Log_EnableLogging(*args, **kwargs):

-    """Log_EnableLogging(bool doIt=True) -> bool"""
-    return _misc_.Log_EnableLogging(*args, **kwargs)
+  """Log_EnableLogging(bool doIt=True) -> bool"""
+  return _misc_.Log_EnableLogging(*args, **kwargs)

 
 def Log_OnLog(*args, **kwargs):
 
 def Log_OnLog(*args, **kwargs):

-    """Log_OnLog(wxLogLevel level, wxChar szString, time_t t)"""
-    return _misc_.Log_OnLog(*args, **kwargs)
+  """Log_OnLog(LogLevel level, wxChar szString, time_t t)"""
+  return _misc_.Log_OnLog(*args, **kwargs)

 
 

-def Log_FlushActive(*args, **kwargs):
-    """Log_FlushActive()"""
-    return _misc_.Log_FlushActive(*args, **kwargs)
+def Log_FlushActive(*args):
+  """Log_FlushActive()"""
+  return _misc_.Log_FlushActive(*args)

 
 

-def Log_GetActiveTarget(*args, **kwargs):
-    """Log_GetActiveTarget() -> Log"""
-    return _misc_.Log_GetActiveTarget(*args, **kwargs)
+def Log_GetActiveTarget(*args):
+  """Log_GetActiveTarget() -> Log"""
+  return _misc_.Log_GetActiveTarget(*args)

 
 def Log_SetActiveTarget(*args, **kwargs):
 
 def Log_SetActiveTarget(*args, **kwargs):

-    """Log_SetActiveTarget(Log pLogger) -> Log"""
-    return _misc_.Log_SetActiveTarget(*args, **kwargs)
+  """Log_SetActiveTarget(Log pLogger) -> Log"""
+  return _misc_.Log_SetActiveTarget(*args, **kwargs)

 
 

-def Log_Suspend(*args, **kwargs):
-    """Log_Suspend()"""
-    return _misc_.Log_Suspend(*args, **kwargs)
+def Log_Suspend(*args):
+  """Log_Suspend()"""
+  return _misc_.Log_Suspend(*args)

 
 

-def Log_Resume(*args, **kwargs):
-    """Log_Resume()"""
-    return _misc_.Log_Resume(*args, **kwargs)
+def Log_Resume(*args):
+  """Log_Resume()"""
+  return _misc_.Log_Resume(*args)

 
 def Log_SetVerbose(*args, **kwargs):
 
 def Log_SetVerbose(*args, **kwargs):

-    """Log_SetVerbose(bool bVerbose=True)"""
-    return _misc_.Log_SetVerbose(*args, **kwargs)
+  """Log_SetVerbose(bool bVerbose=True)"""
+  return _misc_.Log_SetVerbose(*args, **kwargs)

 
 def Log_SetLogLevel(*args, **kwargs):
 
 def Log_SetLogLevel(*args, **kwargs):

-    """Log_SetLogLevel(wxLogLevel logLevel)"""
-    return _misc_.Log_SetLogLevel(*args, **kwargs)
+  """Log_SetLogLevel(LogLevel logLevel)"""
+  return _misc_.Log_SetLogLevel(*args, **kwargs)

 
 

-def Log_DontCreateOnDemand(*args, **kwargs):
-    """Log_DontCreateOnDemand()"""
-    return _misc_.Log_DontCreateOnDemand(*args, **kwargs)
+def Log_DontCreateOnDemand(*args):
+  """Log_DontCreateOnDemand()"""
+  return _misc_.Log_DontCreateOnDemand(*args)

 
 def Log_SetTraceMask(*args, **kwargs):
 
 def Log_SetTraceMask(*args, **kwargs):

-    """Log_SetTraceMask(wxTraceMask ulMask)"""
-    return _misc_.Log_SetTraceMask(*args, **kwargs)
+  """Log_SetTraceMask(TraceMask ulMask)"""
+  return _misc_.Log_SetTraceMask(*args, **kwargs)

 
 def Log_AddTraceMask(*args, **kwargs):
 
 def Log_AddTraceMask(*args, **kwargs):

-    """Log_AddTraceMask(String str)"""
-    return _misc_.Log_AddTraceMask(*args, **kwargs)
+  """Log_AddTraceMask(String str)"""
+  return _misc_.Log_AddTraceMask(*args, **kwargs)

 
 def Log_RemoveTraceMask(*args, **kwargs):
 
 def Log_RemoveTraceMask(*args, **kwargs):

-    """Log_RemoveTraceMask(String str)"""
-    return _misc_.Log_RemoveTraceMask(*args, **kwargs)
+  """Log_RemoveTraceMask(String str)"""
+  return _misc_.Log_RemoveTraceMask(*args, **kwargs)

 
 

-def Log_ClearTraceMasks(*args, **kwargs):
-    """Log_ClearTraceMasks()"""
-    return _misc_.Log_ClearTraceMasks(*args, **kwargs)
+def Log_ClearTraceMasks(*args):
+  """Log_ClearTraceMasks()"""
+  return _misc_.Log_ClearTraceMasks(*args)

 
 

-def Log_GetTraceMasks(*args, **kwargs):
-    """Log_GetTraceMasks() -> wxArrayString"""
-    return _misc_.Log_GetTraceMasks(*args, **kwargs)
+def Log_GetTraceMasks(*args):
+  """Log_GetTraceMasks() -> wxArrayString"""
+  return _misc_.Log_GetTraceMasks(*args)

 
 def Log_SetTimestamp(*args, **kwargs):
 
 def Log_SetTimestamp(*args, **kwargs):

-    """Log_SetTimestamp(wxChar ts)"""
-    return _misc_.Log_SetTimestamp(*args, **kwargs)
+  """Log_SetTimestamp(wxChar ts)"""
+  return _misc_.Log_SetTimestamp(*args, **kwargs)

 
 

-def Log_GetVerbose(*args, **kwargs):
-    """Log_GetVerbose() -> bool"""
-    return _misc_.Log_GetVerbose(*args, **kwargs)
+def Log_GetVerbose(*args):
+  """Log_GetVerbose() -> bool"""
+  return _misc_.Log_GetVerbose(*args)

 
 

-def Log_GetTraceMask(*args, **kwargs):
-    """Log_GetTraceMask() -> wxTraceMask"""
-    return _misc_.Log_GetTraceMask(*args, **kwargs)
+def Log_GetTraceMask(*args):
+  """Log_GetTraceMask() -> TraceMask"""
+  return _misc_.Log_GetTraceMask(*args)

 
 def Log_IsAllowedTraceMask(*args, **kwargs):
 
 def Log_IsAllowedTraceMask(*args, **kwargs):

-    """Log_IsAllowedTraceMask(wxChar mask) -> bool"""
-    return _misc_.Log_IsAllowedTraceMask(*args, **kwargs)
+  """Log_IsAllowedTraceMask(wxChar mask) -> bool"""
+  return _misc_.Log_IsAllowedTraceMask(*args, **kwargs)

 
 

-def Log_GetLogLevel(*args, **kwargs):
-    """Log_GetLogLevel() -> wxLogLevel"""
-    return _misc_.Log_GetLogLevel(*args, **kwargs)
+def Log_GetLogLevel(*args):
+  """Log_GetLogLevel() -> LogLevel"""
+  return _misc_.Log_GetLogLevel(*args)

 
 

-def Log_GetTimestamp(*args, **kwargs):
-    """Log_GetTimestamp() -> wxChar"""
-    return _misc_.Log_GetTimestamp(*args, **kwargs)
+def Log_GetTimestamp(*args):
+  """Log_GetTimestamp() -> wxChar"""
+  return _misc_.Log_GetTimestamp(*args)

 
 

-def Log_TimeStamp(*args, **kwargs):
-    """Log_TimeStamp() -> String"""
-    return _misc_.Log_TimeStamp(*args, **kwargs)
+def Log_TimeStamp(*args):
+  """Log_TimeStamp() -> String"""
+  return _misc_.Log_TimeStamp(*args)

 
 class LogStderr(Log):
 
 class LogStderr(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogStderr instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogStderr class"""
+    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) -> LogStderr"""
         """__init__(self) -> LogStderr"""

-        newobj = _misc_.new_LogStderr(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class LogStderrPtr(LogStderr):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogStderr
-_misc_.LogStderr_swigregister(LogStderrPtr)
+        _misc_.LogStderr_swiginit(self,_misc_.new_LogStderr(*args, **kwargs))
+_misc_.LogStderr_swigregister(LogStderr)

 
 class LogTextCtrl(Log):
 
 class LogTextCtrl(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogTextCtrl instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogTextCtrl class"""
+    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, wxTextCtrl pTextCtrl) -> LogTextCtrl"""
         """__init__(self, wxTextCtrl pTextCtrl) -> LogTextCtrl"""

-        newobj = _misc_.new_LogTextCtrl(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class LogTextCtrlPtr(LogTextCtrl):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogTextCtrl
-_misc_.LogTextCtrl_swigregister(LogTextCtrlPtr)
+        _misc_.LogTextCtrl_swiginit(self,_misc_.new_LogTextCtrl(*args, **kwargs))
+_misc_.LogTextCtrl_swigregister(LogTextCtrl)

 
 class LogGui(Log):
 
 class LogGui(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogGui instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogGui class"""
+    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) -> LogGui"""
         """__init__(self) -> LogGui"""

-        newobj = _misc_.new_LogGui(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-
-class LogGuiPtr(LogGui):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogGui
-_misc_.LogGui_swigregister(LogGuiPtr)
+        _misc_.LogGui_swiginit(self,_misc_.new_LogGui(*args, **kwargs))
+_misc_.LogGui_swigregister(LogGui)

 
 class LogWindow(Log):
 
 class LogWindow(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogWindow class"""
+    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, wxFrame pParent, String szTitle, bool bShow=True, bool bPassToOld=True) -> LogWindow"""
         """__init__(self, wxFrame pParent, String szTitle, bool bShow=True, bool bPassToOld=True) -> LogWindow"""

-        newobj = _misc_.new_LogWindow(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.LogWindow_swiginit(self,_misc_.new_LogWindow(*args, **kwargs))

     def Show(*args, **kwargs):
         """Show(self, bool bShow=True)"""
         return _misc_.LogWindow_Show(*args, **kwargs)
     def Show(*args, **kwargs):
         """Show(self, bool bShow=True)"""
         return _misc_.LogWindow_Show(*args, **kwargs)


@@ -1409,23 +1505,15 @@ class LogWindow(Log):
         """PassMessages(self, bool bDoPass)"""
         return _misc_.LogWindow_PassMessages(*args, **kwargs)
 
         """PassMessages(self, bool bDoPass)"""
         return _misc_.LogWindow_PassMessages(*args, **kwargs)
 

-
-class LogWindowPtr(LogWindow):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogWindow
-_misc_.LogWindow_swigregister(LogWindowPtr)
+_misc_.LogWindow_swigregister(LogWindow)

 
 class LogChain(Log):
 
 class LogChain(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogChain instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogChain class"""
+    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, Log logger) -> LogChain"""
         """__init__(self, Log logger) -> LogChain"""

-        newobj = _misc_.new_LogChain(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.LogChain_swiginit(self,_misc_.new_LogChain(*args, **kwargs))

     def SetLog(*args, **kwargs):
         """SetLog(self, Log logger)"""
         return _misc_.LogChain_SetLog(*args, **kwargs)
     def SetLog(*args, **kwargs):
         """SetLog(self, Log logger)"""
         return _misc_.LogChain_SetLog(*args, **kwargs)


@@ -1442,122 +1530,109 @@ class LogChain(Log):
         """GetOldLog(self) -> Log"""
         return _misc_.LogChain_GetOldLog(*args, **kwargs)
 
         """GetOldLog(self) -> Log"""
         return _misc_.LogChain_GetOldLog(*args, **kwargs)
 

+_misc_.LogChain_swigregister(LogChain)

 
 

-class LogChainPtr(LogChain):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogChain
-_misc_.LogChain_swigregister(LogChainPtr)
+class LogBuffer(Log):
+    """Proxy of C++ LogBuffer class"""
+    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) -> LogBuffer"""
+        _misc_.LogBuffer_swiginit(self,_misc_.new_LogBuffer(*args, **kwargs))
+    def GetBuffer(*args, **kwargs):
+        """GetBuffer(self) -> String"""
+        return _misc_.LogBuffer_GetBuffer(*args, **kwargs)

 
 

+_misc_.LogBuffer_swigregister(LogBuffer)

 
 

-def SysErrorCode(*args, **kwargs):
-    """SysErrorCode() -> unsigned long"""
-    return _misc_.SysErrorCode(*args, **kwargs)
+
+def SysErrorCode(*args):
+  """SysErrorCode() -> unsigned long"""
+  return _misc_.SysErrorCode(*args)

 
 def SysErrorMsg(*args, **kwargs):
 
 def SysErrorMsg(*args, **kwargs):

-    """SysErrorMsg(unsigned long nErrCode=0) -> String"""
-    return _misc_.SysErrorMsg(*args, **kwargs)
+  """SysErrorMsg(unsigned long nErrCode=0) -> String"""
+  return _misc_.SysErrorMsg(*args, **kwargs)

 
 def LogFatalError(*args, **kwargs):
 
 def LogFatalError(*args, **kwargs):

-    """LogFatalError(String msg)"""
-    return _misc_.LogFatalError(*args, **kwargs)
+  """LogFatalError(String msg)"""
+  return _misc_.LogFatalError(*args, **kwargs)

 
 def LogError(*args, **kwargs):
 
 def LogError(*args, **kwargs):

-    """LogError(String msg)"""
-    return _misc_.LogError(*args, **kwargs)
+  """LogError(String msg)"""
+  return _misc_.LogError(*args, **kwargs)

 
 def LogWarning(*args, **kwargs):
 
 def LogWarning(*args, **kwargs):

-    """LogWarning(String msg)"""
-    return _misc_.LogWarning(*args, **kwargs)
+  """LogWarning(String msg)"""
+  return _misc_.LogWarning(*args, **kwargs)

 
 def LogMessage(*args, **kwargs):
 
 def LogMessage(*args, **kwargs):

-    """LogMessage(String msg)"""
-    return _misc_.LogMessage(*args, **kwargs)
+  """LogMessage(String msg)"""
+  return _misc_.LogMessage(*args, **kwargs)

 
 def LogInfo(*args, **kwargs):
 
 def LogInfo(*args, **kwargs):

-    """LogInfo(String msg)"""
-    return _misc_.LogInfo(*args, **kwargs)
+  """LogInfo(String msg)"""
+  return _misc_.LogInfo(*args, **kwargs)

 
 def LogDebug(*args, **kwargs):
 
 def LogDebug(*args, **kwargs):

-    """LogDebug(String msg)"""
-    return _misc_.LogDebug(*args, **kwargs)
+  """LogDebug(String msg)"""
+  return _misc_.LogDebug(*args, **kwargs)

 
 def LogVerbose(*args, **kwargs):
 
 def LogVerbose(*args, **kwargs):

-    """LogVerbose(String msg)"""
-    return _misc_.LogVerbose(*args, **kwargs)
+  """LogVerbose(String msg)"""
+  return _misc_.LogVerbose(*args, **kwargs)

 
 def LogStatus(*args, **kwargs):
 
 def LogStatus(*args, **kwargs):

-    """LogStatus(String msg)"""
-    return _misc_.LogStatus(*args, **kwargs)
+  """LogStatus(String msg)"""
+  return _misc_.LogStatus(*args, **kwargs)

 
 def LogStatusFrame(*args, **kwargs):
 
 def LogStatusFrame(*args, **kwargs):

-    """LogStatusFrame(wxFrame pFrame, String msg)"""
-    return _misc_.LogStatusFrame(*args, **kwargs)
+  """LogStatusFrame(wxFrame pFrame, String msg)"""
+  return _misc_.LogStatusFrame(*args, **kwargs)

 
 def LogSysError(*args, **kwargs):
 
 def LogSysError(*args, **kwargs):

-    """LogSysError(String msg)"""
-    return _misc_.LogSysError(*args, **kwargs)
+  """LogSysError(String msg)"""
+  return _misc_.LogSysError(*args, **kwargs)

 
 def LogGeneric(*args, **kwargs):
 
 def LogGeneric(*args, **kwargs):

-    """LogGeneric(unsigned long level, String msg)"""
-    return _misc_.LogGeneric(*args, **kwargs)
+  """LogGeneric(unsigned long level, String msg)"""
+  return _misc_.LogGeneric(*args, **kwargs)

 
 def SafeShowMessage(*args, **kwargs):
 
 def SafeShowMessage(*args, **kwargs):

-    """SafeShowMessage(String title, String text)"""
-    return _misc_.SafeShowMessage(*args, **kwargs)
+  """SafeShowMessage(String title, String text)"""
+  return _misc_.SafeShowMessage(*args, **kwargs)

 class LogNull(object):
 class LogNull(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxLogNull instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ LogNull class"""
+    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) -> LogNull"""
         """__init__(self) -> LogNull"""

-        newobj = _misc_.new_LogNull(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_LogNull):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class LogNullPtr(LogNull):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = LogNull
-_misc_.LogNull_swigregister(LogNullPtr)
+        _misc_.LogNull_swiginit(self,_misc_.new_LogNull(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_LogNull
+    __del__ = lambda self : None;
+_misc_.LogNull_swigregister(LogNull)

 
 def LogTrace(*args):
 
 def LogTrace(*args):

-    """
+  """

     LogTrace(unsigned long mask, String msg)
     LogTrace(String mask, String msg)
     """
     LogTrace(unsigned long mask, String msg)
     LogTrace(String mask, String msg)
     """

-    return _misc_.LogTrace(*args)
+  return _misc_.LogTrace(*args)

 
 class PyLog(Log):
 
 class PyLog(Log):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyLog instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ PyLog class"""
+    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) -> PyLog"""
         """__init__(self) -> PyLog"""

-        newobj = _misc_.new_PyLog(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.PyLog_swiginit(self,_misc_.new_PyLog(*args, **kwargs))

         self._setCallbackInfo(self, PyLog)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyLog__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, PyLog)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyLog__setCallbackInfo(*args, **kwargs)
 

-
-class PyLogPtr(PyLog):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyLog
-_misc_.PyLog_swigregister(PyLogPtr)
+_misc_.PyLog_swigregister(PyLog)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -1568,6 +1643,8 @@ KILL_BAD_SIGNAL = _misc_.KILL_BAD_SIGNAL
 KILL_ACCESS_DENIED = _misc_.KILL_ACCESS_DENIED
 KILL_NO_PROCESS = _misc_.KILL_NO_PROCESS
 KILL_ERROR = _misc_.KILL_ERROR
 KILL_ACCESS_DENIED = _misc_.KILL_ACCESS_DENIED
 KILL_NO_PROCESS = _misc_.KILL_NO_PROCESS
 KILL_ERROR = _misc_.KILL_ERROR

+KILL_NOCHILDREN = _misc_.KILL_NOCHILDREN
+KILL_CHILDREN = _misc_.KILL_CHILDREN

 SIGNONE = _misc_.SIGNONE
 SIGHUP = _misc_.SIGHUP
 SIGINT = _misc_.SIGINT
 SIGNONE = _misc_.SIGNONE
 SIGHUP = _misc_.SIGHUP
 SIGINT = _misc_.SIGINT


@@ -1586,10 +1663,11 @@ SIGPIPE = _misc_.SIGPIPE
 SIGALRM = _misc_.SIGALRM
 SIGTERM = _misc_.SIGTERM
 class Process(_core.EvtHandler):
 SIGALRM = _misc_.SIGALRM
 SIGTERM = _misc_.SIGTERM
 class Process(_core.EvtHandler):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    """Proxy of C++ Process class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr

     def Kill(*args, **kwargs):
     def Kill(*args, **kwargs):

-        """Kill(int pid, int sig=SIGTERM) -> int"""
+        """Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""

         return _misc_.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)
         return _misc_.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)


@@ -1603,21 +1681,23 @@ class Process(_core.EvtHandler):
         return _misc_.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)
         return _misc_.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)

-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs): 

         """__init__(self, EvtHandler parent=None, int id=-1) -> Process"""
         """__init__(self, EvtHandler parent=None, int id=-1) -> Process"""

-        newobj = _misc_.new_Process(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))

         self._setCallbackInfo(self, Process)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, Process)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
 

-    def base_OnTerminate(*args, **kwargs):
-        """base_OnTerminate(self, int pid, int status)"""
-        return _misc_.Process_base_OnTerminate(*args, **kwargs)
+    def OnTerminate(*args, **kwargs):
+        """OnTerminate(self, int pid, int status)"""
+        return _misc_.Process_OnTerminate(*args, **kwargs)
+
+    def base_OnTerminate(*args, **kw):
+        return Process.OnTerminate(*args, **kw)
+    base_OnTerminate = wx._deprecated(base_OnTerminate,
+                                   "Please use Process.OnTerminate instead.")

 
     def Redirect(*args, **kwargs):
         """Redirect(self)"""
 
     def Redirect(*args, **kwargs):
         """Redirect(self)"""


@@ -1659,35 +1739,27 @@ class Process(_core.EvtHandler):
         """IsErrorAvailable(self) -> bool"""
         return _misc_.Process_IsErrorAvailable(*args, **kwargs)
 
         """IsErrorAvailable(self) -> bool"""
         return _misc_.Process_IsErrorAvailable(*args, **kwargs)
 

-
-class ProcessPtr(Process):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Process
-_misc_.Process_swigregister(ProcessPtr)
+_misc_.Process_swigregister(Process)

 
 def Process_Kill(*args, **kwargs):
 
 def Process_Kill(*args, **kwargs):

-    """Process_Kill(int pid, int sig=SIGTERM) -> int"""
-    return _misc_.Process_Kill(*args, **kwargs)
+  """Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
+  return _misc_.Process_Kill(*args, **kwargs)

 
 def Process_Exists(*args, **kwargs):
 
 def Process_Exists(*args, **kwargs):

-    """Process_Exists(int pid) -> bool"""
-    return _misc_.Process_Exists(*args, **kwargs)
+  """Process_Exists(int pid) -> bool"""
+  return _misc_.Process_Exists(*args, **kwargs)

 
 def Process_Open(*args, **kwargs):
 
 def Process_Open(*args, **kwargs):

-    """Process_Open(String cmd, int flags=EXEC_ASYNC) -> Process"""
-    return _misc_.Process_Open(*args, **kwargs)
+  """Process_Open(String cmd, int flags=EXEC_ASYNC) -> Process"""
+  return _misc_.Process_Open(*args, **kwargs)

 
 class ProcessEvent(_core.Event):
 
 class ProcessEvent(_core.Event):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxProcessEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ ProcessEvent class"""
+    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 pid=0, int exitcode=0) -> ProcessEvent"""
         """__init__(self, int id=0, int pid=0, int exitcode=0) -> ProcessEvent"""

-        newobj = _misc_.new_ProcessEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.ProcessEvent_swiginit(self,_misc_.new_ProcessEvent(*args, **kwargs))

     def GetPid(*args, **kwargs):
         """GetPid(self) -> int"""
         return _misc_.ProcessEvent_GetPid(*args, **kwargs)
     def GetPid(*args, **kwargs):
         """GetPid(self) -> int"""
         return _misc_.ProcessEvent_GetPid(*args, **kwargs)


@@ -1698,13 +1770,7 @@ class ProcessEvent(_core.Event):
 
     m_pid = property(_misc_.ProcessEvent_m_pid_get, _misc_.ProcessEvent_m_pid_set)
     m_exitcode = property(_misc_.ProcessEvent_m_exitcode_get, _misc_.ProcessEvent_m_exitcode_set)
 
     m_pid = property(_misc_.ProcessEvent_m_pid_get, _misc_.ProcessEvent_m_pid_set)
     m_exitcode = property(_misc_.ProcessEvent_m_exitcode_get, _misc_.ProcessEvent_m_exitcode_set)

-
-class ProcessEventPtr(ProcessEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ProcessEvent
-_misc_.ProcessEvent_swigregister(ProcessEventPtr)
+_misc_.ProcessEvent_swigregister(ProcessEvent)

 
 wxEVT_END_PROCESS = _misc_.wxEVT_END_PROCESS
 EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )
 
 wxEVT_END_PROCESS = _misc_.wxEVT_END_PROCESS
 EVT_END_PROCESS = wx.PyEventBinder( wxEVT_END_PROCESS, 1 )


@@ -1713,10 +1779,15 @@ EXEC_ASYNC = _misc_.EXEC_ASYNC
 EXEC_SYNC = _misc_.EXEC_SYNC
 EXEC_NOHIDE = _misc_.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER
 EXEC_SYNC = _misc_.EXEC_SYNC
 EXEC_NOHIDE = _misc_.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER

+EXEC_NODISABLE = _misc_.EXEC_NODISABLE

 
 def Execute(*args, **kwargs):
 
 def Execute(*args, **kwargs):

-    """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""
-    return _misc_.Execute(*args, **kwargs)
+  """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""
+  return _misc_.Execute(*args, **kwargs)
+
+def Kill(*args, **kwargs):
+  """Kill(long pid, int sig=SIGTERM, int rc, int flags=KILL_NOCHILDREN) -> int"""
+  return _misc_.Kill(*args, **kwargs)

 #---------------------------------------------------------------------------
 
 JOYSTICK1 = _misc_.JOYSTICK1
 #---------------------------------------------------------------------------
 
 JOYSTICK1 = _misc_.JOYSTICK1


@@ -1727,20 +1798,14 @@ JOY_BUTTON2 = _misc_.JOY_BUTTON2
 JOY_BUTTON3 = _misc_.JOY_BUTTON3
 JOY_BUTTON4 = _misc_.JOY_BUTTON4
 class Joystick(object):
 JOY_BUTTON3 = _misc_.JOY_BUTTON3
 JOY_BUTTON4 = _misc_.JOY_BUTTON4
 class Joystick(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxJoystick instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ Joystick class"""
+    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 joystick=JOYSTICK1) -> Joystick"""
         """__init__(self, int joystick=JOYSTICK1) -> Joystick"""

-        newobj = _misc_.new_Joystick(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Joystick):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.Joystick_swiginit(self,_misc_.new_Joystick(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Joystick
+    __del__ = lambda self : None;

     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> Point"""
         return _misc_.Joystick_GetPosition(*args, **kwargs)
     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> Point"""
         return _misc_.Joystick_GetPosition(*args, **kwargs)


@@ -1910,35 +1975,22 @@ class Joystick(object):
         return _misc_.Joystick_ReleaseCapture(*args, **kwargs)
 
     def __nonzero__(self): return self.IsOk() 
         return _misc_.Joystick_ReleaseCapture(*args, **kwargs)
 
     def __nonzero__(self): return self.IsOk() 

-
-class JoystickPtr(Joystick):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Joystick
-_misc_.Joystick_swigregister(JoystickPtr)
+_misc_.Joystick_swigregister(Joystick)

 
 wxEVT_JOY_BUTTON_DOWN = _misc_.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = _misc_.wxEVT_JOY_BUTTON_UP
 wxEVT_JOY_MOVE = _misc_.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = _misc_.wxEVT_JOY_ZMOVE
 class JoystickEvent(_core.Event):
 
 wxEVT_JOY_BUTTON_DOWN = _misc_.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = _misc_.wxEVT_JOY_BUTTON_UP
 wxEVT_JOY_MOVE = _misc_.wxEVT_JOY_MOVE
 wxEVT_JOY_ZMOVE = _misc_.wxEVT_JOY_ZMOVE
 class JoystickEvent(_core.Event):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxJoystickEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    m_pos = property(_misc_.JoystickEvent_m_pos_get, _misc_.JoystickEvent_m_pos_set)
-    m_zPosition = property(_misc_.JoystickEvent_m_zPosition_get, _misc_.JoystickEvent_m_zPosition_set)
-    m_buttonChange = property(_misc_.JoystickEvent_m_buttonChange_get, _misc_.JoystickEvent_m_buttonChange_set)
-    m_buttonState = property(_misc_.JoystickEvent_m_buttonState_get, _misc_.JoystickEvent_m_buttonState_set)
-    m_joyStick = property(_misc_.JoystickEvent_m_joyStick_get, _misc_.JoystickEvent_m_joyStick_set)
-    def __init__(self, *args, **kwargs):
-        """
-        __init__(self, wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 
+    """Proxy of C++ JoystickEvent class"""
+    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, EventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 

             int change=0) -> JoystickEvent
         """
             int change=0) -> JoystickEvent
         """

-        newobj = _misc_.new_JoystickEvent(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.JoystickEvent_swiginit(self,_misc_.new_JoystickEvent(*args, **kwargs))

     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> Point"""
         return _misc_.JoystickEvent_GetPosition(*args, **kwargs)
     def GetPosition(*args, **kwargs):
         """GetPosition(self) -> Point"""
         return _misc_.JoystickEvent_GetPosition(*args, **kwargs)


@@ -2003,13 +2055,13 @@ class JoystickEvent(_core.Event):
         """ButtonIsDown(self, int but=JOY_BUTTON_ANY) -> bool"""
         return _misc_.JoystickEvent_ButtonIsDown(*args, **kwargs)
 
         """ButtonIsDown(self, int but=JOY_BUTTON_ANY) -> bool"""
         return _misc_.JoystickEvent_ButtonIsDown(*args, **kwargs)
 

+    m_pos = property(GetPosition, SetPosition)
+    m_zPosition = property(GetZPosition, SetZPosition)
+    m_buttonChange = property(GetButtonChange, SetButtonChange)
+    m_buttonState = property(GetButtonState, SetButtonState)
+    m_joyStick = property(GetJoystick, SetJoystick)

 
 

-class JoystickEventPtr(JoystickEvent):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = JoystickEvent
-_misc_.JoystickEvent_swigregister(JoystickEventPtr)
+_misc_.JoystickEvent_swigregister(JoystickEvent)

 
 EVT_JOY_BUTTON_DOWN = wx.PyEventBinder( wxEVT_JOY_BUTTON_DOWN )
 EVT_JOY_BUTTON_UP = wx.PyEventBinder( wxEVT_JOY_BUTTON_UP )
 
 EVT_JOY_BUTTON_DOWN = wx.PyEventBinder( wxEVT_JOY_BUTTON_DOWN )
 EVT_JOY_BUTTON_UP = wx.PyEventBinder( wxEVT_JOY_BUTTON_UP )


@@ -2029,20 +2081,14 @@ SOUND_SYNC = _misc_.SOUND_SYNC
 SOUND_ASYNC = _misc_.SOUND_ASYNC
 SOUND_LOOP = _misc_.SOUND_LOOP
 class Sound(object):
 SOUND_ASYNC = _misc_.SOUND_ASYNC
 SOUND_LOOP = _misc_.SOUND_LOOP
 class Sound(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxSound instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ Sound class"""
+    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=EmptyString) -> Sound"""
         """__init__(self, String fileName=EmptyString) -> Sound"""

-        newobj = _misc_.new_Sound(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Sound):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.Sound_swiginit(self,_misc_.new_Sound(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Sound
+    __del__ = lambda self : None;

     def Create(*args, **kwargs):
         """Create(self, String fileName) -> bool"""
         return _misc_.Sound_Create(*args, **kwargs)
     def Create(*args, **kwargs):
         """Create(self, String fileName) -> bool"""
         return _misc_.Sound_Create(*args, **kwargs)


@@ -2070,27 +2116,20 @@ class Sound(object):
 
     Stop = staticmethod(Stop)
     def __nonzero__(self): return self.IsOk() 
 
     Stop = staticmethod(Stop)
     def __nonzero__(self): return self.IsOk() 

-
-class SoundPtr(Sound):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Sound
-_misc_.Sound_swigregister(SoundPtr)
+_misc_.Sound_swigregister(Sound)

 
 def SoundFromData(*args, **kwargs):
     """SoundFromData(PyObject data) -> Sound"""
     val = _misc_.new_SoundFromData(*args, **kwargs)
 
 def SoundFromData(*args, **kwargs):
     """SoundFromData(PyObject data) -> Sound"""
     val = _misc_.new_SoundFromData(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def Sound_PlaySound(*args, **kwargs):
     return val
 
 def Sound_PlaySound(*args, **kwargs):

-    """Sound_PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool"""
-    return _misc_.Sound_PlaySound(*args, **kwargs)
+  """Sound_PlaySound(String filename, unsigned int flags=SOUND_ASYNC) -> bool"""
+  return _misc_.Sound_PlaySound(*args, **kwargs)

 
 

-def Sound_Stop(*args, **kwargs):
-    """Sound_Stop()"""
-    return _misc_.Sound_Stop(*args, **kwargs)
+def Sound_Stop(*args):
+  """Sound_Stop()"""
+  return _misc_.Sound_Stop(*args)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -2100,14 +2139,12 @@ MAILCAP_KDE = _misc_.MAILCAP_KDE
 MAILCAP_GNOME = _misc_.MAILCAP_GNOME
 MAILCAP_ALL = _misc_.MAILCAP_ALL
 class FileTypeInfo(object):
 MAILCAP_GNOME = _misc_.MAILCAP_GNOME
 MAILCAP_ALL = _misc_.MAILCAP_ALL
 class FileTypeInfo(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileTypeInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ FileTypeInfo class"""
+    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 mimeType, String openCmd, String printCmd, String desc) -> FileTypeInfo"""
         """__init__(self, String mimeType, String openCmd, String printCmd, String desc) -> FileTypeInfo"""

-        newobj = _misc_.new_FileTypeInfo(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.FileTypeInfo_swiginit(self,_misc_.new_FileTypeInfo(*args, **kwargs))

     def IsValid(*args, **kwargs):
         """IsValid(self) -> bool"""
         return _misc_.FileTypeInfo_IsValid(*args, **kwargs)
     def IsValid(*args, **kwargs):
         """IsValid(self) -> bool"""
         return _misc_.FileTypeInfo_IsValid(*args, **kwargs)


@@ -2145,7 +2182,7 @@ class FileTypeInfo(object):
         return _misc_.FileTypeInfo_GetExtensions(*args, **kwargs)
 
     def GetExtensionsCount(*args, **kwargs):
         return _misc_.FileTypeInfo_GetExtensions(*args, **kwargs)
 
     def GetExtensionsCount(*args, **kwargs):

-        """GetExtensionsCount(self) -> int"""
+        """GetExtensionsCount(self) -> size_t"""

         return _misc_.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
 
     def GetIconFile(*args, **kwargs):
         return _misc_.FileTypeInfo_GetExtensionsCount(*args, **kwargs)
 
     def GetIconFile(*args, **kwargs):


@@ -2156,41 +2193,27 @@ class FileTypeInfo(object):
         """GetIconIndex(self) -> int"""
         return _misc_.FileTypeInfo_GetIconIndex(*args, **kwargs)
 
         """GetIconIndex(self) -> int"""
         return _misc_.FileTypeInfo_GetIconIndex(*args, **kwargs)
 

-
-class FileTypeInfoPtr(FileTypeInfo):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileTypeInfo
-_misc_.FileTypeInfo_swigregister(FileTypeInfoPtr)
+_misc_.FileTypeInfo_swigregister(FileTypeInfo)

 
 def FileTypeInfoSequence(*args, **kwargs):
     """FileTypeInfoSequence(wxArrayString sArray) -> FileTypeInfo"""
     val = _misc_.new_FileTypeInfoSequence(*args, **kwargs)
 
 def FileTypeInfoSequence(*args, **kwargs):
     """FileTypeInfoSequence(wxArrayString sArray) -> FileTypeInfo"""
     val = _misc_.new_FileTypeInfoSequence(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def NullFileTypeInfo(*args, **kwargs):
     """NullFileTypeInfo() -> FileTypeInfo"""
     val = _misc_.new_NullFileTypeInfo(*args, **kwargs)
     return val
 
 def NullFileTypeInfo(*args, **kwargs):
     """NullFileTypeInfo() -> FileTypeInfo"""
     val = _misc_.new_NullFileTypeInfo(*args, **kwargs)

-    val.thisown = 1

     return val
 
 class FileType(object):
     return val
 
 class FileType(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileType instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ FileType class"""
+    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, FileTypeInfo ftInfo) -> FileType"""
         """__init__(self, FileTypeInfo ftInfo) -> FileType"""

-        newobj = _misc_.new_FileType(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_FileType):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.FileType_swiginit(self,_misc_.new_FileType(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_FileType
+    __del__ = lambda self : None;

     def GetMimeType(*args, **kwargs):
         """GetMimeType(self) -> PyObject"""
         return _misc_.FileType_GetMimeType(*args, **kwargs)
     def GetMimeType(*args, **kwargs):
         """GetMimeType(self) -> PyObject"""
         return _misc_.FileType_GetMimeType(*args, **kwargs)


@@ -2244,32 +2267,24 @@ class FileType(object):
         return _misc_.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)
         return _misc_.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)

-
-class FileTypePtr(FileType):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileType
-_misc_.FileType_swigregister(FileTypePtr)
+_misc_.FileType_swigregister(FileType)

 
 def FileType_ExpandCommand(*args, **kwargs):
 
 def FileType_ExpandCommand(*args, **kwargs):

-    """FileType_ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""
-    return _misc_.FileType_ExpandCommand(*args, **kwargs)
+  """FileType_ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""
+  return _misc_.FileType_ExpandCommand(*args, **kwargs)

 
 class MimeTypesManager(object):
 
 class MimeTypesManager(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    """Proxy of C++ MimeTypesManager class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr

     def IsOfType(*args, **kwargs):
         """IsOfType(String mimeType, String wildcard) -> bool"""
         return _misc_.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)
     def IsOfType(*args, **kwargs):
         """IsOfType(String mimeType, String wildcard) -> bool"""
         return _misc_.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)

-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> MimeTypesManager"""
         """__init__(self) -> MimeTypesManager"""

-        newobj = _misc_.new_MimeTypesManager(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.MimeTypesManager_swiginit(self,_misc_.new_MimeTypesManager(*args, **kwargs))

     def Initialize(*args, **kwargs):
         """Initialize(self, int mailcapStyle=MAILCAP_ALL, String extraDir=EmptyString)"""
         return _misc_.MimeTypesManager_Initialize(*args, **kwargs)
     def Initialize(*args, **kwargs):
         """Initialize(self, int mailcapStyle=MAILCAP_ALL, String extraDir=EmptyString)"""
         return _misc_.MimeTypesManager_Initialize(*args, **kwargs)


@@ -2310,24 +2325,14 @@ class MimeTypesManager(object):
         """Unassociate(self, FileType ft) -> bool"""
         return _misc_.MimeTypesManager_Unassociate(*args, **kwargs)
 
         """Unassociate(self, FileType ft) -> bool"""
         return _misc_.MimeTypesManager_Unassociate(*args, **kwargs)
 

-    def __del__(self, destroy=_misc_.delete_MimeTypesManager):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class MimeTypesManagerPtr(MimeTypesManager):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MimeTypesManager
-_misc_.MimeTypesManager_swigregister(MimeTypesManagerPtr)
+    __swig_destroy__ = _misc_.delete_MimeTypesManager
+    __del__ = lambda self : None;
+_misc_.MimeTypesManager_swigregister(MimeTypesManager)

 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):

-    """MimeTypesManager_IsOfType(String mimeType, String wildcard) -> bool"""
-    return _misc_.MimeTypesManager_IsOfType(*args, **kwargs)
+  """MimeTypesManager_IsOfType(String mimeType, String wildcard) -> bool"""
+  return _misc_.MimeTypesManager_IsOfType(*args, **kwargs)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -2351,9 +2356,9 @@ class ArtProvider(object):
                 return bmp
 
     """
                 return bmp
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyArtProvider 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) -> ArtProvider
 
         """
         __init__(self) -> ArtProvider
 


@@ -2375,12 +2380,11 @@ class ArtProvider(object):
                     return bmp
 
         """
                     return bmp
 
         """

-        newobj = _misc_.new_ArtProvider(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.ArtProvider_swiginit(self,_misc_.new_ArtProvider(*args, **kwargs))

         self._setCallbackInfo(self, ArtProvider)
 
         self._setCallbackInfo(self, ArtProvider)
 

+    __swig_destroy__ = _misc_.delete_ArtProvider
+    __del__ = lambda self : None;

     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)


@@ -2410,7 +2414,9 @@ class ArtProvider(object):
         Remove provider. The provider must have been added previously!  The
         provider is _not_ deleted.
         """
         Remove provider. The provider must have been added previously!  The
         provider is _not_ deleted.
         """

-        return _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+        val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+        args[1].thisown = 1
+        return val

 
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):
 
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):


@@ -2433,23 +2439,30 @@ class ArtProvider(object):
         return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 
     GetIcon = staticmethod(GetIcon)
         return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 
     GetIcon = staticmethod(GetIcon)

+    def GetSizeHint(*args, **kwargs):
+        """
+        GetSizeHint(String client, bool platform_dependent=False) -> Size
+
+        Get the size hint of an icon from a specific Art Client, queries the
+        topmost provider if platform_dependent = false
+        """
+        return _misc_.ArtProvider_GetSizeHint(*args, **kwargs)
+
+    GetSizeHint = staticmethod(GetSizeHint)

     def Destroy(*args, **kwargs):
         """Destroy(self)"""
     def Destroy(*args, **kwargs):
         """Destroy(self)"""

-        return _misc_.ArtProvider_Destroy(*args, **kwargs)
-
+        val = _misc_.ArtProvider_Destroy(*args, **kwargs)
+        args[0].thisown = 0
+        return val

 
 

-class ArtProviderPtr(ArtProvider):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ArtProvider
-_misc_.ArtProvider_swigregister(ArtProviderPtr)
+_misc_.ArtProvider_swigregister(ArtProvider)

 ART_TOOLBAR = cvar.ART_TOOLBAR
 ART_MENU = cvar.ART_MENU
 ART_FRAME_ICON = cvar.ART_FRAME_ICON
 ART_CMN_DIALOG = cvar.ART_CMN_DIALOG
 ART_HELP_BROWSER = cvar.ART_HELP_BROWSER
 ART_MESSAGE_BOX = cvar.ART_MESSAGE_BOX
 ART_TOOLBAR = cvar.ART_TOOLBAR
 ART_MENU = cvar.ART_MENU
 ART_FRAME_ICON = cvar.ART_FRAME_ICON
 ART_CMN_DIALOG = cvar.ART_CMN_DIALOG
 ART_HELP_BROWSER = cvar.ART_HELP_BROWSER
 ART_MESSAGE_BOX = cvar.ART_MESSAGE_BOX

+ART_BUTTON = cvar.ART_BUTTON

 ART_OTHER = cvar.ART_OTHER
 ART_ADD_BOOKMARK = cvar.ART_ADD_BOOKMARK
 ART_DEL_BOOKMARK = cvar.ART_DEL_BOOKMARK
 ART_OTHER = cvar.ART_OTHER
 ART_ADD_BOOKMARK = cvar.ART_ADD_BOOKMARK
 ART_DEL_BOOKMARK = cvar.ART_DEL_BOOKMARK


@@ -2465,13 +2478,20 @@ ART_GO_DOWN = cvar.ART_GO_DOWN
 ART_GO_TO_PARENT = cvar.ART_GO_TO_PARENT
 ART_GO_HOME = cvar.ART_GO_HOME
 ART_FILE_OPEN = cvar.ART_FILE_OPEN
 ART_GO_TO_PARENT = cvar.ART_GO_TO_PARENT
 ART_GO_HOME = cvar.ART_GO_HOME
 ART_FILE_OPEN = cvar.ART_FILE_OPEN

+ART_FILE_SAVE = cvar.ART_FILE_SAVE
+ART_FILE_SAVE_AS = cvar.ART_FILE_SAVE_AS

 ART_PRINT = cvar.ART_PRINT
 ART_HELP = cvar.ART_HELP
 ART_TIP = cvar.ART_TIP
 ART_REPORT_VIEW = cvar.ART_REPORT_VIEW
 ART_LIST_VIEW = cvar.ART_LIST_VIEW
 ART_NEW_DIR = cvar.ART_NEW_DIR
 ART_PRINT = cvar.ART_PRINT
 ART_HELP = cvar.ART_HELP
 ART_TIP = cvar.ART_TIP
 ART_REPORT_VIEW = cvar.ART_REPORT_VIEW
 ART_LIST_VIEW = cvar.ART_LIST_VIEW
 ART_NEW_DIR = cvar.ART_NEW_DIR

+ART_HARDDISK = cvar.ART_HARDDISK
+ART_FLOPPY = cvar.ART_FLOPPY
+ART_CDROM = cvar.ART_CDROM
+ART_REMOVABLE = cvar.ART_REMOVABLE

 ART_FOLDER = cvar.ART_FOLDER
 ART_FOLDER = cvar.ART_FOLDER

+ART_FOLDER_OPEN = cvar.ART_FOLDER_OPEN

 ART_GO_DIR_UP = cvar.ART_GO_DIR_UP
 ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE
 ART_NORMAL_FILE = cvar.ART_NORMAL_FILE
 ART_GO_DIR_UP = cvar.ART_GO_DIR_UP
 ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE
 ART_NORMAL_FILE = cvar.ART_NORMAL_FILE


@@ -2482,49 +2502,70 @@ ART_QUESTION = cvar.ART_QUESTION
 ART_WARNING = cvar.ART_WARNING
 ART_INFORMATION = cvar.ART_INFORMATION
 ART_MISSING_IMAGE = cvar.ART_MISSING_IMAGE
 ART_WARNING = cvar.ART_WARNING
 ART_INFORMATION = cvar.ART_INFORMATION
 ART_MISSING_IMAGE = cvar.ART_MISSING_IMAGE

+ART_COPY = cvar.ART_COPY
+ART_CUT = cvar.ART_CUT
+ART_PASTE = cvar.ART_PASTE
+ART_DELETE = cvar.ART_DELETE
+ART_NEW = cvar.ART_NEW
+ART_UNDO = cvar.ART_UNDO
+ART_REDO = cvar.ART_REDO
+ART_QUIT = cvar.ART_QUIT
+ART_FIND = cvar.ART_FIND
+ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE

 
 def ArtProvider_PushProvider(*args, **kwargs):
 
 def ArtProvider_PushProvider(*args, **kwargs):

-    """
+  """

     ArtProvider_PushProvider(ArtProvider provider)
 
     Add new provider to the top of providers stack.
     """
     ArtProvider_PushProvider(ArtProvider provider)
 
     Add new provider to the top of providers stack.
     """

-    return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+  return _misc_.ArtProvider_PushProvider(*args, **kwargs)

 
 

-def ArtProvider_PopProvider(*args, **kwargs):
-    """
+def ArtProvider_PopProvider(*args):
+  """

     ArtProvider_PopProvider() -> bool
 
     Remove latest added provider and delete it.
     """
     ArtProvider_PopProvider() -> bool
 
     Remove latest added provider and delete it.
     """

-    return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+  return _misc_.ArtProvider_PopProvider(*args)

 
 def ArtProvider_RemoveProvider(*args, **kwargs):
 
 def ArtProvider_RemoveProvider(*args, **kwargs):

-    """
+  """

     ArtProvider_RemoveProvider(ArtProvider provider) -> bool
 
     Remove provider. The provider must have been added previously!  The
     provider is _not_ deleted.
     """
     ArtProvider_RemoveProvider(ArtProvider provider) -> bool
 
     Remove provider. The provider must have been added previously!  The
     provider is _not_ deleted.
     """

-    return _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+  val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+  args[1].thisown = 1
+  return val

 
 def ArtProvider_GetBitmap(*args, **kwargs):
 
 def ArtProvider_GetBitmap(*args, **kwargs):

-    """
+  """

     ArtProvider_GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
 
     Query the providers for bitmap with given ID and return it. Return
     wx.NullBitmap if no provider provides it.
     """
     ArtProvider_GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
 
     Query the providers for bitmap with given ID and return it. Return
     wx.NullBitmap if no provider provides it.
     """

-    return _misc_.ArtProvider_GetBitmap(*args, **kwargs)
+  return _misc_.ArtProvider_GetBitmap(*args, **kwargs)

 
 def ArtProvider_GetIcon(*args, **kwargs):
 
 def ArtProvider_GetIcon(*args, **kwargs):

-    """
+  """

     ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon
 
     Query the providers for icon with given ID and return it.  Return
     wx.NullIcon if no provider provides it.
     """
     ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon
 
     Query the providers for icon with given ID and return it.  Return
     wx.NullIcon if no provider provides it.
     """

-    return _misc_.ArtProvider_GetIcon(*args, **kwargs)
+  return _misc_.ArtProvider_GetIcon(*args, **kwargs)
+
+def ArtProvider_GetSizeHint(*args, **kwargs):
+  """
+    ArtProvider_GetSizeHint(String client, bool platform_dependent=False) -> Size
+
+    Get the size hint of an icon from a specific Art Client, queries the
+    topmost provider if platform_dependent = false
+    """
+  return _misc_.ArtProvider_GetSizeHint(*args, **kwargs)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -2553,15 +2594,11 @@ class ConfigBase(object):
     should be kept small, no more than a couple kilobytes.
 
     """
     should be kept small, no more than a couple kilobytes.
 
     """

-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfigBase instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __del__(self, destroy=_misc_.delete_ConfigBase):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    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
+    __swig_destroy__ = _misc_.delete_ConfigBase
+    __del__ = lambda self : None;

     Type_Unknown = _misc_.ConfigBase_Type_Unknown
     Type_String = _misc_.ConfigBase_Type_String
     Type_Boolean = _misc_.ConfigBase_Type_Boolean
     Type_Unknown = _misc_.ConfigBase_Type_Unknown
     Type_String = _misc_.ConfigBase_Type_String
     Type_Boolean = _misc_.ConfigBase_Type_Boolean


@@ -2901,108 +2938,76 @@ class ConfigBase(object):
         """GetStyle(self) -> long"""
         return _misc_.ConfigBase_GetStyle(*args, **kwargs)
 
         """GetStyle(self) -> long"""
         return _misc_.ConfigBase_GetStyle(*args, **kwargs)
 

-
-class ConfigBasePtr(ConfigBase):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ConfigBase
-_misc_.ConfigBase_swigregister(ConfigBasePtr)
+_misc_.ConfigBase_swigregister(ConfigBase)

 
 def ConfigBase_Set(*args, **kwargs):
 
 def ConfigBase_Set(*args, **kwargs):

-    """
+  """

     ConfigBase_Set(ConfigBase config) -> ConfigBase
 
     Sets the global config object (the one returned by Get) and returns a
     reference to the previous global config object.
     """
     ConfigBase_Set(ConfigBase config) -> ConfigBase
 
     Sets the global config object (the one returned by Get) and returns a
     reference to the previous global config object.
     """

-    return _misc_.ConfigBase_Set(*args, **kwargs)
+  return _misc_.ConfigBase_Set(*args, **kwargs)

 
 def ConfigBase_Get(*args, **kwargs):
 
 def ConfigBase_Get(*args, **kwargs):

-    """
+  """

     ConfigBase_Get(bool createOnDemand=True) -> ConfigBase
 
     Returns the current global config object, creating one if neccessary.
     """
     ConfigBase_Get(bool createOnDemand=True) -> ConfigBase
 
     Returns the current global config object, creating one if neccessary.
     """

-    return _misc_.ConfigBase_Get(*args, **kwargs)
+  return _misc_.ConfigBase_Get(*args, **kwargs)

 
 

-def ConfigBase_Create(*args, **kwargs):
-    """
+def ConfigBase_Create(*args):
+  """

     ConfigBase_Create() -> ConfigBase
 
     Create and return a new global config object.  This function will
     create the "best" implementation of wx.Config available for the
     current platform.
     """
     ConfigBase_Create() -> ConfigBase
 
     Create and return a new global config object.  This function will
     create the "best" implementation of wx.Config available for the
     current platform.
     """

-    return _misc_.ConfigBase_Create(*args, **kwargs)
+  return _misc_.ConfigBase_Create(*args)

 
 

-def ConfigBase_DontCreateOnDemand(*args, **kwargs):
-    """
+def ConfigBase_DontCreateOnDemand(*args):
+  """

     ConfigBase_DontCreateOnDemand()
 
     Should Get() try to create a new log object if there isn't a current
     one?
     """
     ConfigBase_DontCreateOnDemand()
 
     Should Get() try to create a new log object if there isn't a current
     one?
     """

-    return _misc_.ConfigBase_DontCreateOnDemand(*args, **kwargs)
+  return _misc_.ConfigBase_DontCreateOnDemand(*args)

 
 class Config(ConfigBase):
     """
     This ConfigBase-derived class will use the registry on Windows,
     and will be a wx.FileConfig on other platforms.
     """
 
 class Config(ConfigBase):
     """
     This ConfigBase-derived class will use the registry on Windows,
     and will be a wx.FileConfig on other platforms.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfig 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 appName=EmptyString, String vendorName=EmptyString, 
             String localFilename=EmptyString, String globalFilename=EmptyString, 
             long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -> Config
         """
         """
         __init__(self, String appName=EmptyString, String vendorName=EmptyString, 
             String localFilename=EmptyString, String globalFilename=EmptyString, 
             long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -> Config
         """

-        newobj = _misc_.new_Config(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Config):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class ConfigPtr(Config):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Config
-_misc_.Config_swigregister(ConfigPtr)
+        _misc_.Config_swiginit(self,_misc_.new_Config(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Config
+    __del__ = lambda self : None;
+_misc_.Config_swigregister(Config)

 
 class FileConfig(ConfigBase):
     """This config class will use a file for storage on all platforms."""
 
 class FileConfig(ConfigBase):
     """This config class will use a file for storage on all platforms."""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileConfig 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 appName=EmptyString, String vendorName=EmptyString, 
             String localFilename=EmptyString, String globalFilename=EmptyString, 
             long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -> FileConfig
         """
         """
         __init__(self, String appName=EmptyString, String vendorName=EmptyString, 
             String localFilename=EmptyString, String globalFilename=EmptyString, 
             long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -> FileConfig
         """

-        newobj = _misc_.new_FileConfig(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_FileConfig):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
-
-class FileConfigPtr(FileConfig):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileConfig
-_misc_.FileConfig_swigregister(FileConfigPtr)
+        _misc_.FileConfig_swiginit(self,_misc_.new_FileConfig(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_FileConfig
+    __del__ = lambda self : None;
+_misc_.FileConfig_swigregister(FileConfig)

 
 class ConfigPathChanger(object):
     """
 
 class ConfigPathChanger(object):
     """


@@ -3011,20 +3016,13 @@ class ConfigPathChanger(object):
     variable of this type, you work in the entry directory and the path is
     automatically restored when the function returns.
     """
     variable of this type, you work in the entry directory and the path is
     automatically restored when the function returns.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxConfigPathChanger 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, ConfigBase config, String entry) -> ConfigPathChanger"""
         """__init__(self, ConfigBase config, String entry) -> ConfigPathChanger"""

-        newobj = _misc_.new_ConfigPathChanger(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_ConfigPathChanger):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.ConfigPathChanger_swiginit(self,_misc_.new_ConfigPathChanger(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_ConfigPathChanger
+    __del__ = lambda self : None;

     def Name(*args, **kwargs):
         """
         Name(self) -> String
     def Name(*args, **kwargs):
         """
         Name(self) -> String


@@ -3033,17 +3031,11 @@ class ConfigPathChanger(object):
         """
         return _misc_.ConfigPathChanger_Name(*args, **kwargs)
 
         """
         return _misc_.ConfigPathChanger_Name(*args, **kwargs)
 

-
-class ConfigPathChangerPtr(ConfigPathChanger):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ConfigPathChanger
-_misc_.ConfigPathChanger_swigregister(ConfigPathChangerPtr)
+_misc_.ConfigPathChanger_swigregister(ConfigPathChanger)

 
 
 def ExpandEnvVars(*args, **kwargs):
 
 
 def ExpandEnvVars(*args, **kwargs):

-    """
+  """

     ExpandEnvVars(String sz) -> String
 
     Replace environment variables ($SOMETHING) with their values. The
     ExpandEnvVars(String sz) -> String
 
     Replace environment variables ($SOMETHING) with their values. The


@@ -3051,12 +3043,13 @@ def ExpandEnvVars(*args, **kwargs):
     characters and '_' only. '$' must be escaped ('\$') in order to be
     taken literally.
     """
     characters and '_' only. '$' must be escaped ('\$') in order to be
     taken literally.
     """

-    return _misc_.ExpandEnvVars(*args, **kwargs)
+  return _misc_.ExpandEnvVars(*args, **kwargs)

 #---------------------------------------------------------------------------
 
 class DateTime(object):
 #---------------------------------------------------------------------------
 
 class DateTime(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDateTime instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    """Proxy of C++ DateTime class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr

     Local = _misc_.DateTime_Local
     GMT_12 = _misc_.DateTime_GMT_12
     GMT_11 = _misc_.DateTime_GMT_11
     Local = _misc_.DateTime_Local
     GMT_12 = _misc_.DateTime_GMT_12
     GMT_11 = _misc_.DateTime_GMT_11


@@ -3311,18 +3304,11 @@ class DateTime(object):
         return _misc_.DateTime_Today(*args, **kwargs)
 
     Today = staticmethod(Today)
         return _misc_.DateTime_Today(*args, **kwargs)
 
     Today = staticmethod(Today)

-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs): 

         """__init__(self) -> DateTime"""
         """__init__(self) -> DateTime"""

-        newobj = _misc_.new_DateTime(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_DateTime):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.DateTime_swiginit(self,_misc_.new_DateTime(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_DateTime
+    __del__ = lambda self : None;

     def SetToCurrent(*args, **kwargs):
         """SetToCurrent(self) -> DateTime"""
         return _misc_.DateTime_SetToCurrent(*args, **kwargs)
     def SetToCurrent(*args, **kwargs):
         """SetToCurrent(self) -> DateTime"""
         return _misc_.DateTime_SetToCurrent(*args, **kwargs)


@@ -3422,6 +3408,14 @@ class DateTime(object):
         """GetWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> DateTime"""
         return _misc_.DateTime_GetWeek(*args, **kwargs)
 
         """GetWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> DateTime"""
         return _misc_.DateTime_GetWeek(*args, **kwargs)
 

+    SetToTheWeek = wx._deprecated(SetToTheWeek, "SetToTheWeek is deprecated, use (static) SetToWeekOfYear instead")
+    GetWeek = wx._deprecated(GetWeek, "GetWeek is deprecated, use GetWeekOfYear instead")
+
+    def SetToWeekOfYear(*args, **kwargs):
+        """SetToWeekOfYear(int year, int numWeek, int weekday=Mon) -> DateTime"""
+        return _misc_.DateTime_SetToWeekOfYear(*args, **kwargs)
+
+    SetToWeekOfYear = staticmethod(SetToWeekOfYear)

     def SetToLastMonthDay(*args, **kwargs):
         """SetToLastMonthDay(self, int month=Inv_Month, int year=Inv_Year) -> DateTime"""
         return _misc_.DateTime_SetToLastMonthDay(*args, **kwargs)
     def SetToLastMonthDay(*args, **kwargs):
         """SetToLastMonthDay(self, int month=Inv_Month, int year=Inv_Year) -> DateTime"""
         return _misc_.DateTime_SetToLastMonthDay(*args, **kwargs)


@@ -3466,6 +3460,22 @@ class DateTime(object):
         """MakeTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeTimezone(*args, **kwargs)
 
         """MakeTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeTimezone(*args, **kwargs)
 

+    def FromTimezone(*args, **kwargs):
+        """FromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromTimezone(*args, **kwargs)
+
+    def MakeFromTimezone(*args, **kwargs):
+        """MakeFromTimezone(self, wxDateTime::TimeZone tz, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromTimezone(*args, **kwargs)
+
+    def ToUTC(*args, **kwargs):
+        """ToUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_ToUTC(*args, **kwargs)
+
+    def MakeUTC(*args, **kwargs):
+        """MakeUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeUTC(*args, **kwargs)
+

     def ToGMT(*args, **kwargs):
         """ToGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_ToGMT(*args, **kwargs)
     def ToGMT(*args, **kwargs):
         """ToGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_ToGMT(*args, **kwargs)


@@ -3474,6 +3484,14 @@ class DateTime(object):
         """MakeGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeGMT(*args, **kwargs)
 
         """MakeGMT(self, bool noDST=False) -> DateTime"""
         return _misc_.DateTime_MakeGMT(*args, **kwargs)
 

+    def FromUTC(*args, **kwargs):
+        """FromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_FromUTC(*args, **kwargs)
+
+    def MakeFromUTC(*args, **kwargs):
+        """MakeFromUTC(self, bool noDST=False) -> DateTime"""
+        return _misc_.DateTime_MakeFromUTC(*args, **kwargs)
+

     def IsDST(*args, **kwargs):
         """IsDST(self, int country=Country_Default) -> int"""
         return _misc_.DateTime_IsDST(*args, **kwargs)
     def IsDST(*args, **kwargs):
         """IsDST(self, int country=Country_Default) -> int"""
         return _misc_.DateTime_IsDST(*args, **kwargs)


@@ -3617,36 +3635,36 @@ class DateTime(object):
         """
         return _misc_.DateTime___sub__(*args)
 
         """
         return _misc_.DateTime___sub__(*args)
 

-    def __lt__(*args):
+    def __lt__(*args, **kwargs):

         """__lt__(self, DateTime other) -> bool"""
         """__lt__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___lt__(*args)
+        return _misc_.DateTime___lt__(*args, **kwargs)

 
 

-    def __le__(*args):
+    def __le__(*args, **kwargs):

         """__le__(self, DateTime other) -> bool"""
         """__le__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___le__(*args)
+        return _misc_.DateTime___le__(*args, **kwargs)

 
 

-    def __gt__(*args):
+    def __gt__(*args, **kwargs):

         """__gt__(self, DateTime other) -> bool"""
         """__gt__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___gt__(*args)
+        return _misc_.DateTime___gt__(*args, **kwargs)

 
 

-    def __ge__(*args):
+    def __ge__(*args, **kwargs):

         """__ge__(self, DateTime other) -> bool"""
         """__ge__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___ge__(*args)
+        return _misc_.DateTime___ge__(*args, **kwargs)

 
 

-    def __eq__(*args):
+    def __eq__(*args, **kwargs):

         """__eq__(self, DateTime other) -> bool"""
         """__eq__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___eq__(*args)
+        return _misc_.DateTime___eq__(*args, **kwargs)

 
 

-    def __ne__(*args):
+    def __ne__(*args, **kwargs):

         """__ne__(self, DateTime other) -> bool"""
         """__ne__(self, DateTime other) -> bool"""

-        return _misc_.DateTime___ne__(*args)
+        return _misc_.DateTime___ne__(*args, **kwargs)

 
     def ParseRfc822Date(*args, **kwargs):
         """ParseRfc822Date(self, String date) -> int"""
         return _misc_.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):
 
     def ParseRfc822Date(*args, **kwargs):
         """ParseRfc822Date(self, String date) -> int"""
         return _misc_.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):

-        """ParseFormat(self, String date, String format=DateFormatStr, DateTime dateDef=DefaultDateTime) -> int"""
+        """ParseFormat(self, String date, String format=DefaultDateTimeFormat, DateTime dateDef=DefaultDateTime) -> int"""

         return _misc_.DateTime_ParseFormat(*args, **kwargs)
 
     def ParseDateTime(*args, **kwargs):
         return _misc_.DateTime_ParseFormat(*args, **kwargs)
 
     def ParseDateTime(*args, **kwargs):


@@ -3662,7 +3680,7 @@ class DateTime(object):
         return _misc_.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc_.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):

-        """Format(self, String format=DateFormatStr, wxDateTime::TimeZone tz=LOCAL_TZ) -> String"""
+        """Format(self, String format=DefaultDateTimeFormat, wxDateTime::TimeZone tz=LOCAL_TZ) -> String"""

         return _misc_.DateTime_Format(*args, **kwargs)
 
     def FormatDate(*args, **kwargs):
         return _misc_.DateTime_Format(*args, **kwargs)
 
     def FormatDate(*args, **kwargs):


@@ -3683,121 +3701,113 @@ class DateTime(object):
 
     def __repr__(self):
         if self.IsValid():
 
     def __repr__(self):
         if self.IsValid():

-            return '<wx.DateTime: \"%s\" at %s>' % ( self.Format(), self.this)
+            f = self.Format().encode(wx.GetDefaultPyEncoding())
+            return '<wx.DateTime: \"%s\" at %s>' % ( f, self.this)

         else:
             return '<wx.DateTime: \"INVALID\" at %s>' % self.this
     def __str__(self):
         if self.IsValid():
         else:
             return '<wx.DateTime: \"INVALID\" at %s>' % self.this
     def __str__(self):
         if self.IsValid():

-            return self.Format()
+            return self.Format().encode(wx.GetDefaultPyEncoding())

         else:
             return "INVALID DateTime"
 
         else:
             return "INVALID DateTime"
 

-
-class DateTimePtr(DateTime):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DateTime
-_misc_.DateTime_swigregister(DateTimePtr)
-DateFormatStr = cvar.DateFormatStr
-TimeSpanFormatStr = cvar.TimeSpanFormatStr
+_misc_.DateTime_swigregister(DateTime)
+DefaultDateTimeFormat = cvar.DefaultDateTimeFormat
+DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat

 
 def DateTime_SetCountry(*args, **kwargs):
 
 def DateTime_SetCountry(*args, **kwargs):

-    """DateTime_SetCountry(int country)"""
-    return _misc_.DateTime_SetCountry(*args, **kwargs)
+  """DateTime_SetCountry(int country)"""
+  return _misc_.DateTime_SetCountry(*args, **kwargs)

 
 

-def DateTime_GetCountry(*args, **kwargs):
-    """DateTime_GetCountry() -> int"""
-    return _misc_.DateTime_GetCountry(*args, **kwargs)
+def DateTime_GetCountry(*args):
+  """DateTime_GetCountry() -> int"""
+  return _misc_.DateTime_GetCountry(*args)

 
 def DateTime_IsWestEuropeanCountry(*args, **kwargs):
 
 def DateTime_IsWestEuropeanCountry(*args, **kwargs):

-    """DateTime_IsWestEuropeanCountry(int country=Country_Default) -> bool"""
-    return _misc_.DateTime_IsWestEuropeanCountry(*args, **kwargs)
+  """DateTime_IsWestEuropeanCountry(int country=Country_Default) -> bool"""
+  return _misc_.DateTime_IsWestEuropeanCountry(*args, **kwargs)

 
 def DateTime_GetCurrentYear(*args, **kwargs):
 
 def DateTime_GetCurrentYear(*args, **kwargs):

-    """DateTime_GetCurrentYear(int cal=Gregorian) -> int"""
-    return _misc_.DateTime_GetCurrentYear(*args, **kwargs)
+  """DateTime_GetCurrentYear(int cal=Gregorian) -> int"""
+  return _misc_.DateTime_GetCurrentYear(*args, **kwargs)

 
 def DateTime_ConvertYearToBC(*args, **kwargs):
 
 def DateTime_ConvertYearToBC(*args, **kwargs):

-    """DateTime_ConvertYearToBC(int year) -> int"""
-    return _misc_.DateTime_ConvertYearToBC(*args, **kwargs)
+  """DateTime_ConvertYearToBC(int year) -> int"""
+  return _misc_.DateTime_ConvertYearToBC(*args, **kwargs)

 
 def DateTime_GetCurrentMonth(*args, **kwargs):
 
 def DateTime_GetCurrentMonth(*args, **kwargs):

-    """DateTime_GetCurrentMonth(int cal=Gregorian) -> int"""
-    return _misc_.DateTime_GetCurrentMonth(*args, **kwargs)
+  """DateTime_GetCurrentMonth(int cal=Gregorian) -> int"""
+  return _misc_.DateTime_GetCurrentMonth(*args, **kwargs)

 
 def DateTime_IsLeapYear(*args, **kwargs):
 
 def DateTime_IsLeapYear(*args, **kwargs):

-    """DateTime_IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""
-    return _misc_.DateTime_IsLeapYear(*args, **kwargs)
+  """DateTime_IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""
+  return _misc_.DateTime_IsLeapYear(*args, **kwargs)

 
 def DateTime_GetCentury(*args, **kwargs):
 
 def DateTime_GetCentury(*args, **kwargs):

-    """DateTime_GetCentury(int year=Inv_Year) -> int"""
-    return _misc_.DateTime_GetCentury(*args, **kwargs)
+  """DateTime_GetCentury(int year=Inv_Year) -> int"""
+  return _misc_.DateTime_GetCentury(*args, **kwargs)

 
 def DateTime_GetNumberOfDaysinYear(*args, **kwargs):
 
 def DateTime_GetNumberOfDaysinYear(*args, **kwargs):

-    """DateTime_GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""
-    return _misc_.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
+  """DateTime_GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""
+  return _misc_.DateTime_GetNumberOfDaysinYear(*args, **kwargs)

 
 def DateTime_GetNumberOfDaysInMonth(*args, **kwargs):
 
 def DateTime_GetNumberOfDaysInMonth(*args, **kwargs):

-    """DateTime_GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""
-    return _misc_.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
+  """DateTime_GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""
+  return _misc_.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)

 
 def DateTime_GetMonthName(*args, **kwargs):
 
 def DateTime_GetMonthName(*args, **kwargs):

-    """DateTime_GetMonthName(int month, int flags=Name_Full) -> String"""
-    return _misc_.DateTime_GetMonthName(*args, **kwargs)
+  """DateTime_GetMonthName(int month, int flags=Name_Full) -> String"""
+  return _misc_.DateTime_GetMonthName(*args, **kwargs)

 
 def DateTime_GetWeekDayName(*args, **kwargs):
 
 def DateTime_GetWeekDayName(*args, **kwargs):

-    """DateTime_GetWeekDayName(int weekday, int flags=Name_Full) -> String"""
-    return _misc_.DateTime_GetWeekDayName(*args, **kwargs)
+  """DateTime_GetWeekDayName(int weekday, int flags=Name_Full) -> String"""
+  return _misc_.DateTime_GetWeekDayName(*args, **kwargs)

 
 

-def DateTime_GetAmPmStrings(*args, **kwargs):
-    """
+def DateTime_GetAmPmStrings(*args):
+  """

     GetAmPmStrings() -> (am, pm)
 
     Get the AM and PM strings in the current locale (may be empty)
     """
     GetAmPmStrings() -> (am, pm)
 
     Get the AM and PM strings in the current locale (may be empty)
     """

-    return _misc_.DateTime_GetAmPmStrings(*args, **kwargs)
+  return _misc_.DateTime_GetAmPmStrings(*args)

 
 def DateTime_IsDSTApplicable(*args, **kwargs):
 
 def DateTime_IsDSTApplicable(*args, **kwargs):

-    """DateTime_IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""
-    return _misc_.DateTime_IsDSTApplicable(*args, **kwargs)
+  """DateTime_IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""
+  return _misc_.DateTime_IsDSTApplicable(*args, **kwargs)

 
 def DateTime_GetBeginDST(*args, **kwargs):
 
 def DateTime_GetBeginDST(*args, **kwargs):

-    """DateTime_GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
-    return _misc_.DateTime_GetBeginDST(*args, **kwargs)
+  """DateTime_GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
+  return _misc_.DateTime_GetBeginDST(*args, **kwargs)

 
 def DateTime_GetEndDST(*args, **kwargs):
 
 def DateTime_GetEndDST(*args, **kwargs):

-    """DateTime_GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
-    return _misc_.DateTime_GetEndDST(*args, **kwargs)
+  """DateTime_GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
+  return _misc_.DateTime_GetEndDST(*args, **kwargs)

 
 

-def DateTime_Now(*args, **kwargs):
-    """DateTime_Now() -> DateTime"""
-    return _misc_.DateTime_Now(*args, **kwargs)
+def DateTime_Now(*args):
+  """DateTime_Now() -> DateTime"""
+  return _misc_.DateTime_Now(*args)

 
 

-def DateTime_UNow(*args, **kwargs):
-    """DateTime_UNow() -> DateTime"""
-    return _misc_.DateTime_UNow(*args, **kwargs)
+def DateTime_UNow(*args):
+  """DateTime_UNow() -> DateTime"""
+  return _misc_.DateTime_UNow(*args)

 
 

-def DateTime_Today(*args, **kwargs):
-    """DateTime_Today() -> DateTime"""
-    return _misc_.DateTime_Today(*args, **kwargs)
+def DateTime_Today(*args):
+  """DateTime_Today() -> DateTime"""
+  return _misc_.DateTime_Today(*args)

 
 def DateTimeFromTimeT(*args, **kwargs):
     """DateTimeFromTimeT(time_t timet) -> DateTime"""
     val = _misc_.new_DateTimeFromTimeT(*args, **kwargs)
 
 def DateTimeFromTimeT(*args, **kwargs):
     """DateTimeFromTimeT(time_t timet) -> DateTime"""
     val = _misc_.new_DateTimeFromTimeT(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def DateTimeFromJDN(*args, **kwargs):
     """DateTimeFromJDN(double jdn) -> DateTime"""
     val = _misc_.new_DateTimeFromJDN(*args, **kwargs)
     return val
 
 def DateTimeFromJDN(*args, **kwargs):
     """DateTimeFromJDN(double jdn) -> DateTime"""
     val = _misc_.new_DateTimeFromJDN(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def DateTimeFromHMS(*args, **kwargs):
     """DateTimeFromHMS(int hour, int minute=0, int second=0, int millisec=0) -> DateTime"""
     val = _misc_.new_DateTimeFromHMS(*args, **kwargs)
     return val
 
 def DateTimeFromHMS(*args, **kwargs):
     """DateTimeFromHMS(int hour, int minute=0, int second=0, int millisec=0) -> DateTime"""
     val = _misc_.new_DateTimeFromHMS(*args, **kwargs)

-    val.thisown = 1

     return val
 
 def DateTimeFromDMY(*args, **kwargs):
     return val
 
 def DateTimeFromDMY(*args, **kwargs):


@@ -3806,12 +3816,31 @@ def DateTimeFromDMY(*args, **kwargs):
         int minute=0, int second=0, int millisec=0) -> DateTime
     """
     val = _misc_.new_DateTimeFromDMY(*args, **kwargs)
         int minute=0, int second=0, int millisec=0) -> DateTime
     """
     val = _misc_.new_DateTimeFromDMY(*args, **kwargs)

-    val.thisown = 1

     return val
 
     return val
 

+def DateTimeFromDateTime(*args, **kwargs):
+    """DateTimeFromDateTime(DateTime date) -> DateTime"""
+    val = _misc_.new_DateTimeFromDateTime(*args, **kwargs)
+    return val
+
+def DateTime_SetToWeekOfYear(*args, **kwargs):
+  """DateTime_SetToWeekOfYear(int year, int numWeek, int weekday=Mon) -> DateTime"""
+  return _misc_.DateTime_SetToWeekOfYear(*args, **kwargs)
+

 class TimeSpan(object):
 class TimeSpan(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
+    """Proxy of C++ TimeSpan class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def Milliseconds(*args, **kwargs):
+        """Milliseconds(long ms) -> TimeSpan"""
+        return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+    Milliseconds = staticmethod(Milliseconds)
+    def Millisecond(*args, **kwargs):
+        """Millisecond() -> TimeSpan"""
+        return _misc_.TimeSpan_Millisecond(*args, **kwargs)
+
+    Millisecond = staticmethod(Millisecond)

     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)
     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -3862,18 +3891,11 @@ class TimeSpan(object):
         return _misc_.TimeSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)
         return _misc_.TimeSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)

-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs): 

         """__init__(self, long hours=0, long minutes=0, long seconds=0, long milliseconds=0) -> TimeSpan"""
         """__init__(self, long hours=0, long minutes=0, long seconds=0, long milliseconds=0) -> TimeSpan"""

-        newobj = _misc_.new_TimeSpan(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_TimeSpan):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.TimeSpan_swiginit(self,_misc_.new_TimeSpan(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_TimeSpan
+    __del__ = lambda self : None;

     def Add(*args, **kwargs):
         """Add(self, TimeSpan diff) -> TimeSpan"""
         return _misc_.TimeSpan_Add(*args, **kwargs)
     def Add(*args, **kwargs):
         """Add(self, TimeSpan diff) -> TimeSpan"""
         return _misc_.TimeSpan_Add(*args, **kwargs)


@@ -3999,77 +4021,74 @@ class TimeSpan(object):
         return _misc_.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc_.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):

-        """Format(self, String format=TimeSpanFormatStr) -> String"""
+        """Format(self, String format=DefaultTimeSpanFormat) -> String"""

         return _misc_.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):
         return _misc_.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):

-        return '<wx.TimeSpan: \"%s\" at %s>' % ( self.Format(), self.this)
+        f = self.Format().encode(wx.GetDefaultPyEncoding())
+        return '<wx.TimeSpan: \"%s\" at %s>' % ( f, self.this)

     def __str__(self):
     def __str__(self):

-        return self.Format()
+        return self.Format().encode(wx.GetDefaultPyEncoding())

 
 

+_misc_.TimeSpan_swigregister(TimeSpan)

 
 

-class TimeSpanPtr(TimeSpan):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TimeSpan
-_misc_.TimeSpan_swigregister(TimeSpanPtr)
+def TimeSpan_Milliseconds(*args, **kwargs):
+  """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
+  return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+def TimeSpan_Millisecond(*args):
+  """TimeSpan_Millisecond() -> TimeSpan"""
+  return _misc_.TimeSpan_Millisecond(*args)

 
 def TimeSpan_Seconds(*args, **kwargs):
 
 def TimeSpan_Seconds(*args, **kwargs):

-    """TimeSpan_Seconds(long sec) -> TimeSpan"""
-    return _misc_.TimeSpan_Seconds(*args, **kwargs)
+  """TimeSpan_Seconds(long sec) -> TimeSpan"""
+  return _misc_.TimeSpan_Seconds(*args, **kwargs)

 
 

-def TimeSpan_Second(*args, **kwargs):
-    """TimeSpan_Second() -> TimeSpan"""
-    return _misc_.TimeSpan_Second(*args, **kwargs)
+def TimeSpan_Second(*args):
+  """TimeSpan_Second() -> TimeSpan"""
+  return _misc_.TimeSpan_Second(*args)

 
 def TimeSpan_Minutes(*args, **kwargs):
 
 def TimeSpan_Minutes(*args, **kwargs):

-    """TimeSpan_Minutes(long min) -> TimeSpan"""
-    return _misc_.TimeSpan_Minutes(*args, **kwargs)
+  """TimeSpan_Minutes(long min) -> TimeSpan"""
+  return _misc_.TimeSpan_Minutes(*args, **kwargs)

 
 

-def TimeSpan_Minute(*args, **kwargs):
-    """TimeSpan_Minute() -> TimeSpan"""
-    return _misc_.TimeSpan_Minute(*args, **kwargs)
+def TimeSpan_Minute(*args):
+  """TimeSpan_Minute() -> TimeSpan"""
+  return _misc_.TimeSpan_Minute(*args)

 
 def TimeSpan_Hours(*args, **kwargs):
 
 def TimeSpan_Hours(*args, **kwargs):

-    """TimeSpan_Hours(long hours) -> TimeSpan"""
-    return _misc_.TimeSpan_Hours(*args, **kwargs)
+  """TimeSpan_Hours(long hours) -> TimeSpan"""
+  return _misc_.TimeSpan_Hours(*args, **kwargs)

 
 

-def TimeSpan_Hour(*args, **kwargs):
-    """TimeSpan_Hour() -> TimeSpan"""
-    return _misc_.TimeSpan_Hour(*args, **kwargs)
+def TimeSpan_Hour(*args):
+  """TimeSpan_Hour() -> TimeSpan"""
+  return _misc_.TimeSpan_Hour(*args)

 
 def TimeSpan_Days(*args, **kwargs):
 
 def TimeSpan_Days(*args, **kwargs):

-    """TimeSpan_Days(long days) -> TimeSpan"""
-    return _misc_.TimeSpan_Days(*args, **kwargs)
+  """TimeSpan_Days(long days) -> TimeSpan"""
+  return _misc_.TimeSpan_Days(*args, **kwargs)

 
 

-def TimeSpan_Day(*args, **kwargs):
-    """TimeSpan_Day() -> TimeSpan"""
-    return _misc_.TimeSpan_Day(*args, **kwargs)
+def TimeSpan_Day(*args):
+  """TimeSpan_Day() -> TimeSpan"""
+  return _misc_.TimeSpan_Day(*args)

 
 def TimeSpan_Weeks(*args, **kwargs):
 
 def TimeSpan_Weeks(*args, **kwargs):

-    """TimeSpan_Weeks(long days) -> TimeSpan"""
-    return _misc_.TimeSpan_Weeks(*args, **kwargs)
+  """TimeSpan_Weeks(long days) -> TimeSpan"""
+  return _misc_.TimeSpan_Weeks(*args, **kwargs)

 
 

-def TimeSpan_Week(*args, **kwargs):
-    """TimeSpan_Week() -> TimeSpan"""
-    return _misc_.TimeSpan_Week(*args, **kwargs)
+def TimeSpan_Week(*args):
+  """TimeSpan_Week() -> TimeSpan"""
+  return _misc_.TimeSpan_Week(*args)

 
 class DateSpan(object):
 
 class DateSpan(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDateSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ DateSpan class"""
+    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 years=0, int months=0, int weeks=0, int days=0) -> DateSpan"""
         """__init__(self, int years=0, int months=0, int weeks=0, int days=0) -> DateSpan"""

-        newobj = _misc_.new_DateSpan(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_DateSpan):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.DateSpan_swiginit(self,_misc_.new_DateSpan(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_DateSpan
+    __del__ = lambda self : None;

     def Days(*args, **kwargs):
         """Days(int days) -> DateSpan"""
         return _misc_.DateSpan_Days(*args, **kwargs)
     def Days(*args, **kwargs):
         """Days(int days) -> DateSpan"""
         return _misc_.DateSpan_Days(*args, **kwargs)


@@ -4202,62 +4221,56 @@ class DateSpan(object):
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 
         """__ne__(self, DateSpan other) -> bool"""
         return _misc_.DateSpan___ne__(*args, **kwargs)
 

-
-class DateSpanPtr(DateSpan):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DateSpan
-_misc_.DateSpan_swigregister(DateSpanPtr)
+_misc_.DateSpan_swigregister(DateSpan)

 
 def DateSpan_Days(*args, **kwargs):
 
 def DateSpan_Days(*args, **kwargs):

-    """DateSpan_Days(int days) -> DateSpan"""
-    return _misc_.DateSpan_Days(*args, **kwargs)
+  """DateSpan_Days(int days) -> DateSpan"""
+  return _misc_.DateSpan_Days(*args, **kwargs)

 
 

-def DateSpan_Day(*args, **kwargs):
-    """DateSpan_Day() -> DateSpan"""
-    return _misc_.DateSpan_Day(*args, **kwargs)
+def DateSpan_Day(*args):
+  """DateSpan_Day() -> DateSpan"""
+  return _misc_.DateSpan_Day(*args)

 
 def DateSpan_Weeks(*args, **kwargs):
 
 def DateSpan_Weeks(*args, **kwargs):

-    """DateSpan_Weeks(int weeks) -> DateSpan"""
-    return _misc_.DateSpan_Weeks(*args, **kwargs)
+  """DateSpan_Weeks(int weeks) -> DateSpan"""
+  return _misc_.DateSpan_Weeks(*args, **kwargs)

 
 

-def DateSpan_Week(*args, **kwargs):
-    """DateSpan_Week() -> DateSpan"""
-    return _misc_.DateSpan_Week(*args, **kwargs)
+def DateSpan_Week(*args):
+  """DateSpan_Week() -> DateSpan"""
+  return _misc_.DateSpan_Week(*args)

 
 def DateSpan_Months(*args, **kwargs):
 
 def DateSpan_Months(*args, **kwargs):

-    """DateSpan_Months(int mon) -> DateSpan"""
-    return _misc_.DateSpan_Months(*args, **kwargs)
+  """DateSpan_Months(int mon) -> DateSpan"""
+  return _misc_.DateSpan_Months(*args, **kwargs)

 
 

-def DateSpan_Month(*args, **kwargs):
-    """DateSpan_Month() -> DateSpan"""
-    return _misc_.DateSpan_Month(*args, **kwargs)
+def DateSpan_Month(*args):
+  """DateSpan_Month() -> DateSpan"""
+  return _misc_.DateSpan_Month(*args)

 
 def DateSpan_Years(*args, **kwargs):
 
 def DateSpan_Years(*args, **kwargs):

-    """DateSpan_Years(int years) -> DateSpan"""
-    return _misc_.DateSpan_Years(*args, **kwargs)
+  """DateSpan_Years(int years) -> DateSpan"""
+  return _misc_.DateSpan_Years(*args, **kwargs)

 
 

-def DateSpan_Year(*args, **kwargs):
-    """DateSpan_Year() -> DateSpan"""
-    return _misc_.DateSpan_Year(*args, **kwargs)
+def DateSpan_Year(*args):
+  """DateSpan_Year() -> DateSpan"""
+  return _misc_.DateSpan_Year(*args)

 
 
 
 

-def GetLocalTime(*args, **kwargs):
-    """GetLocalTime() -> long"""
-    return _misc_.GetLocalTime(*args, **kwargs)
+def GetLocalTime(*args):
+  """GetLocalTime() -> long"""
+  return _misc_.GetLocalTime(*args)

 
 

-def GetUTCTime(*args, **kwargs):
-    """GetUTCTime() -> long"""
-    return _misc_.GetUTCTime(*args, **kwargs)
+def GetUTCTime(*args):
+  """GetUTCTime() -> long"""
+  return _misc_.GetUTCTime(*args)

 
 

-def GetCurrentTime(*args, **kwargs):
-    """GetCurrentTime() -> long"""
-    return _misc_.GetCurrentTime(*args, **kwargs)
+def GetCurrentTime(*args):
+  """GetCurrentTime() -> long"""
+  return _misc_.GetCurrentTime(*args)

 
 

-def GetLocalTimeMillis(*args, **kwargs):
-    """GetLocalTimeMillis() -> wxLongLong"""
-    return _misc_.GetLocalTimeMillis(*args, **kwargs)
+def GetLocalTimeMillis(*args):
+  """GetLocalTimeMillis() -> wxLongLong"""
+  return _misc_.GetLocalTimeMillis(*args)

 #---------------------------------------------------------------------------
 
 DF_INVALID = _misc_.DF_INVALID
 #---------------------------------------------------------------------------
 
 DF_INVALID = _misc_.DF_INVALID


@@ -4289,25 +4302,18 @@ class DataFormat(object):
     format the program understands.  A data format is is used to uniquely
     identify this format.
     """
     format the program understands.  A data format is is used to uniquely
     identify this format.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataFormat 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 type) -> DataFormat
 
         Constructs a data format object for one of the standard data formats
         or an empty data object (use SetType or SetId later in this case)
         """
         """
         __init__(self, int type) -> DataFormat
 
         Constructs a data format object for one of the standard data formats
         or an empty data object (use SetType or SetId later in this case)
         """

-        newobj = _misc_.new_DataFormat(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_DataFormat):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.DataFormat_swiginit(self,_misc_.new_DataFormat(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_DataFormat
+    __del__ = lambda self : None;

     def __eq__(*args):
         """
         __eq__(self, int format) -> bool
     def __eq__(*args):
         """
         __eq__(self, int format) -> bool


@@ -4356,13 +4362,7 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_SetId(*args, **kwargs)
 
         """
         return _misc_.DataFormat_SetId(*args, **kwargs)
 

-
-class DataFormatPtr(DataFormat):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DataFormat
-_misc_.DataFormat_swigregister(DataFormatPtr)
+_misc_.DataFormat_swigregister(DataFormat)

 DefaultDateTime = cvar.DefaultDateTime
 
 def CustomDataFormat(*args, **kwargs):
 DefaultDateTime = cvar.DefaultDateTime
 
 def CustomDataFormat(*args, **kwargs):


@@ -4373,7 +4373,6 @@ def CustomDataFormat(*args, **kwargs):
     name.
     """
     val = _misc_.new_CustomDataFormat(*args, **kwargs)
     name.
     """
     val = _misc_.new_CustomDataFormat(*args, **kwargs)

-    val.thisown = 1

     return val
 
 class DataObject(object):
     return val
 
 class DataObject(object):


@@ -4391,18 +4390,14 @@ class DataObject(object):
     `wx.CustomDataObject`.
 
     """
     `wx.CustomDataObject`.
 
     """

-    def __init__(self): raise RuntimeError, "No constructor defined"
-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObject 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

     Get = _misc_.DataObject_Get
     Set = _misc_.DataObject_Set
     Both = _misc_.DataObject_Both
     Get = _misc_.DataObject_Get
     Set = _misc_.DataObject_Set
     Both = _misc_.DataObject_Both

-    def __del__(self, destroy=_misc_.delete_DataObject):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    __swig_destroy__ = _misc_.delete_DataObject
+    __del__ = lambda self : None;

     def GetPreferredFormat(*args, **kwargs):
         """
         GetPreferredFormat(self, int dir=Get) -> DataFormat
     def GetPreferredFormat(*args, **kwargs):
         """
         GetPreferredFormat(self, int dir=Get) -> DataFormat


@@ -4452,7 +4447,6 @@ class DataObject(object):
         GetDataHere(self, DataFormat format) -> String
 
         Get the data bytes in the specified format, returns None on failure.
         GetDataHere(self, DataFormat format) -> String
 
         Get the data bytes in the specified format, returns None on failure.

-

         """
         return _misc_.DataObject_GetDataHere(*args, **kwargs)
 
         """
         return _misc_.DataObject_GetDataHere(*args, **kwargs)
 


@@ -4465,13 +4459,7 @@ class DataObject(object):
         """
         return _misc_.DataObject_SetData(*args, **kwargs)
 
         """
         return _misc_.DataObject_SetData(*args, **kwargs)
 

-
-class DataObjectPtr(DataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DataObject
-_misc_.DataObject_swigregister(DataObjectPtr)
+_misc_.DataObject_swigregister(DataObject)

 FormatInvalid = cvar.FormatInvalid
 
 class DataObjectSimple(DataObject):
 FormatInvalid = cvar.FormatInvalid
 
 class DataObjectSimple(DataObject):


@@ -4484,19 +4472,16 @@ class DataObjectSimple(DataObject):
     or derive your own class from `wx.PyDataObjectSimple`.
 
     """
     or derive your own class from `wx.PyDataObjectSimple`.
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObjectSimple 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, DataFormat format=FormatInvalid) -> DataObjectSimple
 
         Constructor accepts the supported format (none by default) which may
         also be set later with `SetFormat`.
         """
         """
         __init__(self, DataFormat format=FormatInvalid) -> DataObjectSimple
 
         Constructor accepts the supported format (none by default) which may
         also be set later with `SetFormat`.
         """

-        newobj = _misc_.new_DataObjectSimple(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.DataObjectSimple_swiginit(self,_misc_.new_DataObjectSimple(*args, **kwargs))

     def GetFormat(*args, **kwargs):
         """
         GetFormat(self) -> DataFormat
     def GetFormat(*args, **kwargs):
         """
         GetFormat(self) -> DataFormat


@@ -4542,13 +4527,7 @@ class DataObjectSimple(DataObject):
         """
         return _misc_.DataObjectSimple_SetData(*args, **kwargs)
 
         """
         return _misc_.DataObjectSimple_SetData(*args, **kwargs)
 

-
-class DataObjectSimplePtr(DataObjectSimple):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DataObjectSimple
-_misc_.DataObjectSimple_swigregister(DataObjectSimplePtr)
+_misc_.DataObjectSimple_swigregister(DataObjectSimple)

 
 class PyDataObjectSimple(DataObjectSimple):
     """
 
 class PyDataObjectSimple(DataObjectSimple):
     """


@@ -4559,9 +4538,9 @@ class PyDataObjectSimple(DataObjectSimple):
     need to create your own simple single-format type of `wx.DataObject`.
 
     """
     need to create your own simple single-format type of `wx.DataObject`.
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDataObjectSimple 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, DataFormat format=FormatInvalid) -> PyDataObjectSimple
 
         """
         __init__(self, DataFormat format=FormatInvalid) -> PyDataObjectSimple
 


@@ -4572,23 +4551,14 @@ class PyDataObjectSimple(DataObjectSimple):
         need to create your own simple single-format type of `wx.DataObject`.
 
         """
         need to create your own simple single-format type of `wx.DataObject`.
 
         """

-        newobj = _misc_.new_PyDataObjectSimple(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.PyDataObjectSimple_swiginit(self,_misc_.new_PyDataObjectSimple(*args, **kwargs))

         self._setCallbackInfo(self, PyDataObjectSimple)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, PyDataObjectSimple)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
 

-
-class PyDataObjectSimplePtr(PyDataObjectSimple):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyDataObjectSimple
-_misc_.PyDataObjectSimple_swigregister(PyDataObjectSimplePtr)
+_misc_.PyDataObjectSimple_swigregister(PyDataObjectSimple)

 
 class DataObjectComposite(DataObject):
     """
 
 class DataObjectComposite(DataObject):
     """


@@ -4605,9 +4575,9 @@ class DataObjectComposite(DataObject):
     efficiency reasons.
 
     """
     efficiency reasons.
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDataObjectComposite 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) -> DataObjectComposite
 
         """
         __init__(self) -> DataObjectComposite
 


@@ -4624,10 +4594,7 @@ class DataObjectComposite(DataObject):
         efficiency reasons.
 
         """
         efficiency reasons.
 
         """

-        newobj = _misc_.new_DataObjectComposite(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.DataObjectComposite_swiginit(self,_misc_.new_DataObjectComposite(*args, **kwargs))

     def Add(*args, **kwargs):
         """
         Add(self, DataObjectSimple dataObject, bool preferred=False)
     def Add(*args, **kwargs):
         """
         Add(self, DataObjectSimple dataObject, bool preferred=False)


@@ -4637,13 +4604,18 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 

+    def GetReceivedFormat(*args, **kwargs):
+        """
+        GetReceivedFormat(self) -> DataFormat
+
+        Report the format passed to the `SetData` method.  This should be the
+        format of the data object within the composite that recieved data from
+        the clipboard or the DnD operation.  You can use this method to find
+        out what kind of data object was recieved.
+        """
+        return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)

 
 

-class DataObjectCompositePtr(DataObjectComposite):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DataObjectComposite
-_misc_.DataObjectComposite_swigregister(DataObjectCompositePtr)
+_misc_.DataObjectComposite_swigregister(DataObjectComposite)

 
 class TextDataObject(DataObjectSimple):
     """
 
 class TextDataObject(DataObjectSimple):
     """


@@ -4659,19 +4631,16 @@ class TextDataObject(DataObjectSimple):
     requested. For this, `GetTextLength` and `GetText` will have to be
     overridden.
     """
     requested. For this, `GetTextLength` and `GetText` will have to be
     overridden.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxTextDataObject 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 text=EmptyString) -> TextDataObject
 
         Constructor, may be used to initialise the text (otherwise `SetText`
         should be used later).
         """
         """
         __init__(self, String text=EmptyString) -> TextDataObject
 
         Constructor, may be used to initialise the text (otherwise `SetText`
         should be used later).
         """

-        newobj = _misc_.new_TextDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.TextDataObject_swiginit(self,_misc_.new_TextDataObject(*args, **kwargs))

     def GetTextLength(*args, **kwargs):
         """
         GetTextLength(self) -> size_t
     def GetTextLength(*args, **kwargs):
         """
         GetTextLength(self) -> size_t


@@ -4704,13 +4673,7 @@ class TextDataObject(DataObjectSimple):
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 

-
-class TextDataObjectPtr(TextDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TextDataObject
-_misc_.TextDataObject_swigregister(TextDataObjectPtr)
+_misc_.TextDataObject_swigregister(TextDataObject)

 
 class PyTextDataObject(TextDataObject):
     """
 
 class PyTextDataObject(TextDataObject):
     """


@@ -4721,9 +4684,9 @@ class PyTextDataObject(TextDataObject):
     want to be able to provide text on demand instead of preloading it
     into the data object.
     """
     want to be able to provide text on demand instead of preloading it
     into the data object.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTextDataObject 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 text=EmptyString) -> PyTextDataObject
 
         """
         __init__(self, String text=EmptyString) -> PyTextDataObject
 


@@ -4734,23 +4697,14 @@ class PyTextDataObject(TextDataObject):
         want to be able to provide text on demand instead of preloading it
         into the data object.
         """
         want to be able to provide text on demand instead of preloading it
         into the data object.
         """

-        newobj = _misc_.new_PyTextDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.PyTextDataObject_swiginit(self,_misc_.new_PyTextDataObject(*args, **kwargs))

         self._setCallbackInfo(self, PyTextDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTextDataObject__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, PyTextDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTextDataObject__setCallbackInfo(*args, **kwargs)
 

-
-class PyTextDataObjectPtr(PyTextDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyTextDataObject
-_misc_.PyTextDataObject_swigregister(PyTextDataObjectPtr)
+_misc_.PyTextDataObject_swigregister(PyTextDataObject)

 
 class BitmapDataObject(DataObjectSimple):
     """
 
 class BitmapDataObject(DataObjectSimple):
     """


@@ -4759,19 +4713,16 @@ class BitmapDataObject(DataObjectSimple):
     or a `wx.DropSource`.
 
     """
     or a `wx.DropSource`.
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxBitmapDataObject 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=wxNullBitmap) -> BitmapDataObject
 
         Constructor, optionally passing a bitmap (otherwise use `SetBitmap`
         later).
         """
         """
         __init__(self, Bitmap bitmap=wxNullBitmap) -> BitmapDataObject
 
         Constructor, optionally passing a bitmap (otherwise use `SetBitmap`
         later).
         """

-        newobj = _misc_.new_BitmapDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.BitmapDataObject_swiginit(self,_misc_.new_BitmapDataObject(*args, **kwargs))

     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(self) -> Bitmap
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(self) -> Bitmap


@@ -4794,13 +4745,7 @@ class BitmapDataObject(DataObjectSimple):
         """
         return _misc_.BitmapDataObject_SetBitmap(*args, **kwargs)
 
         """
         return _misc_.BitmapDataObject_SetBitmap(*args, **kwargs)
 

-
-class BitmapDataObjectPtr(BitmapDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = BitmapDataObject
-_misc_.BitmapDataObject_swigregister(BitmapDataObjectPtr)
+_misc_.BitmapDataObject_swigregister(BitmapDataObject)

 
 class PyBitmapDataObject(BitmapDataObject):
     """
 
 class PyBitmapDataObject(BitmapDataObject):
     """


@@ -4809,9 +4754,9 @@ class PyBitmapDataObject(BitmapDataObject):
     to methods in the Python derived class. To be able to provide bitmap
     data on demand derive from this class and overload `GetBitmap`.
     """
     to methods in the Python derived class. To be able to provide bitmap
     data on demand derive from this class and overload `GetBitmap`.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyBitmapDataObject 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=wxNullBitmap) -> PyBitmapDataObject
 
         """
         __init__(self, Bitmap bitmap=wxNullBitmap) -> PyBitmapDataObject
 


@@ -4820,23 +4765,14 @@ class PyBitmapDataObject(BitmapDataObject):
         to methods in the Python derived class. To be able to provide bitmap
         data on demand derive from this class and overload `GetBitmap`.
         """
         to methods in the Python derived class. To be able to provide bitmap
         data on demand derive from this class and overload `GetBitmap`.
         """

-        newobj = _misc_.new_PyBitmapDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.PyBitmapDataObject_swiginit(self,_misc_.new_PyBitmapDataObject(*args, **kwargs))

         self._setCallbackInfo(self, PyBitmapDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, PyBitmapDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
 

-
-class PyBitmapDataObjectPtr(PyBitmapDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = PyBitmapDataObject
-_misc_.PyBitmapDataObject_swigregister(PyBitmapDataObjectPtr)
+_misc_.PyBitmapDataObject_swigregister(PyBitmapDataObject)

 
 class FileDataObject(DataObjectSimple):
     """
 
 class FileDataObject(DataObjectSimple):
     """


@@ -4846,21 +4782,12 @@ class FileDataObject(DataObjectSimple):
     Explorer and other compatible programs under Windows or GNOME/KDE
     filemanager under Unix which makes it possible to receive files from
     them using this class.
     Explorer and other compatible programs under Windows or GNOME/KDE
     filemanager under Unix which makes it possible to receive files from
     them using this class.

-
-    :Warning: Under all non-Windows platforms this class is currently
-        "input-only", i.e. you can receive the files from another
-        application, but copying (or dragging) file(s) from a wxWidgets
-        application is not currently supported.
-

     """
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxFileDataObject 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) -> FileDataObject"""
         """__init__(self) -> FileDataObject"""

-        newobj = _misc_.new_FileDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.FileDataObject_swiginit(self,_misc_.new_FileDataObject(*args, **kwargs))

     def GetFilenames(*args, **kwargs):
         """
         GetFilenames(self) -> [names]
     def GetFilenames(*args, **kwargs):
         """
         GetFilenames(self) -> [names]


@@ -4877,13 +4804,7 @@ class FileDataObject(DataObjectSimple):
         """
         return _misc_.FileDataObject_AddFile(*args, **kwargs)
 
         """
         return _misc_.FileDataObject_AddFile(*args, **kwargs)
 

-
-class FileDataObjectPtr(FileDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileDataObject
-_misc_.FileDataObject_swigregister(FileDataObjectPtr)
+_misc_.FileDataObject_swigregister(FileDataObject)

 
 class CustomDataObject(DataObjectSimple):
     """
 
 class CustomDataObject(DataObjectSimple):
     """


@@ -4893,11 +4814,13 @@ class CustomDataObject(DataObjectSimple):
     easily be transfered via strings.  A copy of the data is stored in the
     data object.
     """
     easily be transfered via strings.  A copy of the data is stored in the
     data object.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxCustomDataObject 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): 

         """
         """

-        __init__(self, DataFormat format=FormatInvalid) -> CustomDataObject
+        __init__(self, DataFormat format) -> CustomDataObject
+        __init__(self, String formatName) -> CustomDataObject
+        __init__(self) -> CustomDataObject

 
         wx.CustomDataObject is a specialization of `wx.DataObjectSimple` for
         some application-specific data in arbitrary format.  Python strings
 
         wx.CustomDataObject is a specialization of `wx.DataObjectSimple` for
         some application-specific data in arbitrary format.  Python strings


@@ -4905,10 +4828,7 @@ class CustomDataObject(DataObjectSimple):
         easily be transfered via strings.  A copy of the data is stored in the
         data object.
         """
         easily be transfered via strings.  A copy of the data is stored in the
         data object.
         """

-        newobj = _misc_.new_CustomDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.CustomDataObject_swiginit(self,_misc_.new_CustomDataObject(*args))

     def SetData(*args, **kwargs):
         """
         SetData(self, String data) -> bool
     def SetData(*args, **kwargs):
         """
         SetData(self, String data) -> bool


@@ -4934,32 +4854,23 @@ class CustomDataObject(DataObjectSimple):
         """
         return _misc_.CustomDataObject_GetData(*args, **kwargs)
 
         """
         return _misc_.CustomDataObject_GetData(*args, **kwargs)
 

+_misc_.CustomDataObject_swigregister(CustomDataObject)

 
 

-class CustomDataObjectPtr(CustomDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = CustomDataObject
-_misc_.CustomDataObject_swigregister(CustomDataObjectPtr)
-
-class URLDataObject(DataObjectComposite):
+class URLDataObject(DataObject):

     """
     This data object holds a URL in a format that is compatible with some
     browsers such that it is able to be dragged to or from them.
     """
     """
     This data object holds a URL in a format that is compatible with some
     browsers such that it is able to be dragged to or from them.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxURLDataObject 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) -> URLDataObject
 
         This data object holds a URL in a format that is compatible with some
         browsers such that it is able to be dragged to or from them.
         """
         """
         __init__(self) -> URLDataObject
 
         This data object holds a URL in a format that is compatible with some
         browsers such that it is able to be dragged to or from them.
         """

-        newobj = _misc_.new_URLDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.URLDataObject_swiginit(self,_misc_.new_URLDataObject(*args, **kwargs))

     def GetURL(*args, **kwargs):
         """
         GetURL(self) -> String
     def GetURL(*args, **kwargs):
         """
         GetURL(self) -> String


@@ -4976,23 +4887,15 @@ class URLDataObject(DataObjectComposite):
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 

-
-class URLDataObjectPtr(URLDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = URLDataObject
-_misc_.URLDataObject_swigregister(URLDataObjectPtr)
+_misc_.URLDataObject_swigregister(URLDataObject)

 
 class MetafileDataObject(DataObjectSimple):
 
 class MetafileDataObject(DataObjectSimple):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxMetafileDataObject instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ MetafileDataObject class"""
+    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) -> MetafileDataObject"""
         """__init__(self) -> MetafileDataObject"""

-        newobj = _misc_.new_MetafileDataObject(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.MetafileDataObject_swiginit(self,_misc_.new_MetafileDataObject(*args, **kwargs))

     def SetMetafile(*args, **kwargs):
         """SetMetafile(self, wxMetafile metafile)"""
         return _misc_.MetafileDataObject_SetMetafile(*args, **kwargs)
     def SetMetafile(*args, **kwargs):
         """SetMetafile(self, wxMetafile metafile)"""
         return _misc_.MetafileDataObject_SetMetafile(*args, **kwargs)


@@ -5001,13 +4904,7 @@ class MetafileDataObject(DataObjectSimple):
         """GetMetafile(self) -> wxMetafile"""
         return _misc_.MetafileDataObject_GetMetafile(*args, **kwargs)
 
         """GetMetafile(self) -> wxMetafile"""
         return _misc_.MetafileDataObject_GetMetafile(*args, **kwargs)
 

-
-class MetafileDataObjectPtr(MetafileDataObject):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = MetafileDataObject
-_misc_.MetafileDataObject_swigregister(MetafileDataObjectPtr)
+_misc_.MetafileDataObject_swigregister(MetafileDataObject)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5022,32 +4919,26 @@ DragLink = _misc_.DragLink
 DragCancel = _misc_.DragCancel
 
 def IsDragResultOk(*args, **kwargs):
 DragCancel = _misc_.DragCancel
 
 def IsDragResultOk(*args, **kwargs):

-    """IsDragResultOk(int res) -> bool"""
-    return _misc_.IsDragResultOk(*args, **kwargs)
+  """IsDragResultOk(int res) -> bool"""
+  return _misc_.IsDragResultOk(*args, **kwargs)

 class DropSource(object):
 class DropSource(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ DropSource class"""
+    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, Cursor copy=wxNullCursor, Cursor move=wxNullCursor, 
             Cursor none=wxNullCursor) -> DropSource
         """
         """
         __init__(self, Window win, Cursor copy=wxNullCursor, Cursor move=wxNullCursor, 
             Cursor none=wxNullCursor) -> DropSource
         """

-        newobj = _misc_.new_DropSource(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.DropSource_swiginit(self,_misc_.new_DropSource(*args, **kwargs))

         self._setCallbackInfo(self, DropSource, 0)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
         return _misc_.DropSource__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, DropSource, 0)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
         return _misc_.DropSource__setCallbackInfo(*args, **kwargs)
 

-    def __del__(self, destroy=_misc_.delete_DropSource):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    __swig_destroy__ = _misc_.delete_DropSource
+    __del__ = lambda self : None;

     def SetData(*args, **kwargs):
         """SetData(self, DataObject data)"""
         return _misc_.DropSource_SetData(*args, **kwargs)
     def SetData(*args, **kwargs):
         """SetData(self, DataObject data)"""
         return _misc_.DropSource_SetData(*args, **kwargs)


@@ -5064,39 +4955,44 @@ class DropSource(object):
         """DoDragDrop(self, int flags=Drag_CopyOnly) -> int"""
         return _misc_.DropSource_DoDragDrop(*args, **kwargs)
 
         """DoDragDrop(self, int flags=Drag_CopyOnly) -> int"""
         return _misc_.DropSource_DoDragDrop(*args, **kwargs)
 

-    def base_GiveFeedback(*args, **kwargs):
-        """base_GiveFeedback(self, int effect) -> bool"""
-        return _misc_.DropSource_base_GiveFeedback(*args, **kwargs)
+    def GiveFeedback(*args, **kwargs):
+        """GiveFeedback(self, int effect) -> bool"""
+        return _misc_.DropSource_GiveFeedback(*args, **kwargs)

 
 

+    def base_GiveFeedback(*args, **kw):
+        return DropSource.GiveFeedback(*args, **kw)
+    base_GiveFeedback = wx._deprecated(base_GiveFeedback,
+                                   "Please use DropSource.GiveFeedback instead.")

 
 

-class DropSourcePtr(DropSource):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DropSource
-_misc_.DropSource_swigregister(DropSourcePtr)
+_misc_.DropSource_swigregister(DropSource)
+
+def DROP_ICON(filename):
+    """
+    Returns either a `wx.Cursor` or `wx.Icon` created from the image file
+    ``filename``.  This function is useful with the `wx.DropSource` class
+    which, depending on platform accepts either a icon or a cursor.
+    """
+    img = wx.Image(filename)
+    if wx.Platform == '__WXGTK__':
+        return wx.IconFromBitmap(wx.BitmapFromImage(img))
+    else:
+        return wx.CursorFromImage(img)

 
 class DropTarget(object):
 
 class DropTarget(object):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ DropTarget class"""
+    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, DataObject dataObject=None) -> DropTarget"""
         """__init__(self, DataObject dataObject=None) -> DropTarget"""

-        newobj = _misc_.new_DropTarget(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.DropTarget_swiginit(self,_misc_.new_DropTarget(*args, **kwargs))

         self._setCallbackInfo(self, DropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.DropTarget__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, DropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.DropTarget__setCallbackInfo(*args, **kwargs)
 

-    def __del__(self, destroy=_misc_.delete_DropTarget):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+    __swig_destroy__ = _misc_.delete_DropTarget
+    __del__ = lambda self : None;

     def GetDataObject(*args, **kwargs):
         """GetDataObject(self) -> DataObject"""
         return _misc_.DropTarget_GetDataObject(*args, **kwargs)
     def GetDataObject(*args, **kwargs):
         """GetDataObject(self) -> DataObject"""
         return _misc_.DropTarget_GetDataObject(*args, **kwargs)


@@ -5105,120 +5001,194 @@ class DropTarget(object):
         """SetDataObject(self, DataObject dataObject)"""
         return _misc_.DropTarget_SetDataObject(*args, **kwargs)
 
         """SetDataObject(self, DataObject dataObject)"""
         return _misc_.DropTarget_SetDataObject(*args, **kwargs)
 

-    def base_OnEnter(*args, **kwargs):
-        """base_OnEnter(self, int x, int y, int def) -> int"""
-        return _misc_.DropTarget_base_OnEnter(*args, **kwargs)
+    def OnEnter(*args, **kwargs):
+        """OnEnter(self, int x, int y, int def) -> int"""
+        return _misc_.DropTarget_OnEnter(*args, **kwargs)
+
+    def OnDragOver(*args, **kwargs):
+        """OnDragOver(self, int x, int y, int def) -> int"""
+        return _misc_.DropTarget_OnDragOver(*args, **kwargs)
+
+    def OnLeave(*args, **kwargs):
+        """OnLeave(self)"""
+        return _misc_.DropTarget_OnLeave(*args, **kwargs)
+
+    def OnDrop(*args, **kwargs):
+        """OnDrop(self, int x, int y) -> bool"""
+        return _misc_.DropTarget_OnDrop(*args, **kwargs)
+
+    def base_OnEnter(*args, **kw):
+        return DropTarget.OnEnter(*args, **kw)
+    base_OnEnter = wx._deprecated(base_OnEnter,
+                                   "Please use DropTarget.OnEnter instead.")

 
 

-    def base_OnDragOver(*args, **kwargs):
-        """base_OnDragOver(self, int x, int y, int def) -> int"""
-        return _misc_.DropTarget_base_OnDragOver(*args, **kwargs)
+    def base_OnDragOver(*args, **kw):
+        return DropTarget.OnDragOver(*args, **kw)
+    base_OnDragOver = wx._deprecated(base_OnDragOver,
+                                   "Please use DropTarget.OnDragOver instead.")

 
 

-    def base_OnLeave(*args, **kwargs):
-        """base_OnLeave(self)"""
-        return _misc_.DropTarget_base_OnLeave(*args, **kwargs)
+    def base_OnLeave(*args, **kw):
+        return DropTarget.OnLeave(*args, **kw)
+    base_OnLeave = wx._deprecated(base_OnLeave,
+                                   "Please use DropTarget.OnLeave instead.")

 
 

-    def base_OnDrop(*args, **kwargs):
-        """base_OnDrop(self, int x, int y) -> bool"""
-        return _misc_.DropTarget_base_OnDrop(*args, **kwargs)
+    def base_OnDrop(*args, **kw):
+        return DropTarget.OnDrop(*args, **kw)
+    base_OnDrop = wx._deprecated(base_OnDrop,
+                                   "Please use DropTarget.OnDrop instead.")

 
     def GetData(*args, **kwargs):
         """GetData(self) -> bool"""
         return _misc_.DropTarget_GetData(*args, **kwargs)
 
 
     def GetData(*args, **kwargs):
         """GetData(self) -> bool"""
         return _misc_.DropTarget_GetData(*args, **kwargs)
 

+    def SetDefaultAction(*args, **kwargs):
+        """SetDefaultAction(self, int action)"""
+        return _misc_.DropTarget_SetDefaultAction(*args, **kwargs)

 
 

-class DropTargetPtr(DropTarget):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = DropTarget
-_misc_.DropTarget_swigregister(DropTargetPtr)
+    def GetDefaultAction(*args, **kwargs):
+        """GetDefaultAction(self) -> int"""
+        return _misc_.DropTarget_GetDefaultAction(*args, **kwargs)
+
+_misc_.DropTarget_swigregister(DropTarget)

 
 PyDropTarget = DropTarget 
 class TextDropTarget(DropTarget):
 
 PyDropTarget = DropTarget 
 class TextDropTarget(DropTarget):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyTextDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ TextDropTarget class"""
+    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) -> TextDropTarget"""
         """__init__(self) -> TextDropTarget"""

-        newobj = _misc_.new_TextDropTarget(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.TextDropTarget_swiginit(self,_misc_.new_TextDropTarget(*args, **kwargs))

         self._setCallbackInfo(self, TextDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.TextDropTarget__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, TextDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.TextDropTarget__setCallbackInfo(*args, **kwargs)
 

-    def base_OnEnter(*args, **kwargs):
-        """base_OnEnter(self, int x, int y, int def) -> int"""
-        return _misc_.TextDropTarget_base_OnEnter(*args, **kwargs)
+    def OnDropText(*args, **kwargs):
+        """OnDropText(self, int x, int y, String text) -> bool"""
+        return _misc_.TextDropTarget_OnDropText(*args, **kwargs)
+
+    def OnEnter(*args, **kwargs):
+        """OnEnter(self, int x, int y, int def) -> int"""
+        return _misc_.TextDropTarget_OnEnter(*args, **kwargs)
+
+    def OnDragOver(*args, **kwargs):
+        """OnDragOver(self, int x, int y, int def) -> int"""
+        return _misc_.TextDropTarget_OnDragOver(*args, **kwargs)
+
+    def OnLeave(*args, **kwargs):
+        """OnLeave(self)"""
+        return _misc_.TextDropTarget_OnLeave(*args, **kwargs)
+
+    def OnDrop(*args, **kwargs):
+        """OnDrop(self, int x, int y) -> bool"""
+        return _misc_.TextDropTarget_OnDrop(*args, **kwargs)

 
 

-    def base_OnDragOver(*args, **kwargs):
-        """base_OnDragOver(self, int x, int y, int def) -> int"""
-        return _misc_.TextDropTarget_base_OnDragOver(*args, **kwargs)
+    def OnData(*args, **kwargs):
+        """OnData(self, int x, int y, int def) -> int"""
+        return _misc_.TextDropTarget_OnData(*args, **kwargs)

 
 

-    def base_OnLeave(*args, **kwargs):
-        """base_OnLeave(self)"""
-        return _misc_.TextDropTarget_base_OnLeave(*args, **kwargs)
+    def base_OnDropText(*args, **kw):
+        return TextDropTarget.OnDropText(*args, **kw)
+    base_OnDropText = wx._deprecated(base_OnDropText,
+                                   "Please use TextDropTarget.OnDropText instead.")

 
 

-    def base_OnDrop(*args, **kwargs):
-        """base_OnDrop(self, int x, int y) -> bool"""
-        return _misc_.TextDropTarget_base_OnDrop(*args, **kwargs)
+    def base_OnEnter(*args, **kw):
+        return TextDropTarget.OnEnter(*args, **kw)
+    base_OnEnter = wx._deprecated(base_OnEnter,
+                                   "Please use TextDropTarget.OnEnter instead.")

 
 

-    def base_OnData(*args, **kwargs):
-        """base_OnData(self, int x, int y, int def) -> int"""
-        return _misc_.TextDropTarget_base_OnData(*args, **kwargs)
+    def base_OnDragOver(*args, **kw):
+        return TextDropTarget.OnDragOver(*args, **kw)
+    base_OnDragOver = wx._deprecated(base_OnDragOver,
+                                   "Please use TextDropTarget.OnDragOver instead.")

 
 

+    def base_OnLeave(*args, **kw):
+        return TextDropTarget.OnLeave(*args, **kw)
+    base_OnLeave = wx._deprecated(base_OnLeave,
+                                   "Please use TextDropTarget.OnLeave instead.")

 
 

-class TextDropTargetPtr(TextDropTarget):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = TextDropTarget
-_misc_.TextDropTarget_swigregister(TextDropTargetPtr)
+    def base_OnDrop(*args, **kw):
+        return TextDropTarget.OnDrop(*args, **kw)
+    base_OnDrop = wx._deprecated(base_OnDrop,
+                                   "Please use TextDropTarget.OnDrop instead.")
+
+    def base_OnData(*args, **kw):
+        return TextDropTarget.OnData(*args, **kw)
+    base_OnData = wx._deprecated(base_OnData,
+                                   "Please use TextDropTarget.OnData instead.")
+
+_misc_.TextDropTarget_swigregister(TextDropTarget)

 
 class FileDropTarget(DropTarget):
 
 class FileDropTarget(DropTarget):

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxPyFileDropTarget instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
-    def __init__(self, *args, **kwargs):
+    """Proxy of C++ FileDropTarget class"""
+    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) -> FileDropTarget"""
         """__init__(self) -> FileDropTarget"""

-        newobj = _misc_.new_FileDropTarget(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
+        _misc_.FileDropTarget_swiginit(self,_misc_.new_FileDropTarget(*args, **kwargs))

         self._setCallbackInfo(self, FileDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.FileDropTarget__setCallbackInfo(*args, **kwargs)
 
         self._setCallbackInfo(self, FileDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.FileDropTarget__setCallbackInfo(*args, **kwargs)
 

-    def base_OnEnter(*args, **kwargs):
-        """base_OnEnter(self, int x, int y, int def) -> int"""
-        return _misc_.FileDropTarget_base_OnEnter(*args, **kwargs)
+    def OnDropFiles(*args, **kwargs):
+        """OnDropFiles(self, int x, int y, wxArrayString filenames) -> bool"""
+        return _misc_.FileDropTarget_OnDropFiles(*args, **kwargs)
+
+    def OnEnter(*args, **kwargs):
+        """OnEnter(self, int x, int y, int def) -> int"""
+        return _misc_.FileDropTarget_OnEnter(*args, **kwargs)
+
+    def OnDragOver(*args, **kwargs):
+        """OnDragOver(self, int x, int y, int def) -> int"""
+        return _misc_.FileDropTarget_OnDragOver(*args, **kwargs)

 
 

-    def base_OnDragOver(*args, **kwargs):
-        """base_OnDragOver(self, int x, int y, int def) -> int"""
-        return _misc_.FileDropTarget_base_OnDragOver(*args, **kwargs)
+    def OnLeave(*args, **kwargs):
+        """OnLeave(self)"""
+        return _misc_.FileDropTarget_OnLeave(*args, **kwargs)

 
 

-    def base_OnLeave(*args, **kwargs):
-        """base_OnLeave(self)"""
-        return _misc_.FileDropTarget_base_OnLeave(*args, **kwargs)
+    def OnDrop(*args, **kwargs):
+        """OnDrop(self, int x, int y) -> bool"""
+        return _misc_.FileDropTarget_OnDrop(*args, **kwargs)

 
 

-    def base_OnDrop(*args, **kwargs):
-        """base_OnDrop(self, int x, int y) -> bool"""
-        return _misc_.FileDropTarget_base_OnDrop(*args, **kwargs)
+    def OnData(*args, **kwargs):
+        """OnData(self, int x, int y, int def) -> int"""
+        return _misc_.FileDropTarget_OnData(*args, **kwargs)

 
 

-    def base_OnData(*args, **kwargs):
-        """base_OnData(self, int x, int y, int def) -> int"""
-        return _misc_.FileDropTarget_base_OnData(*args, **kwargs)
+    def base_OnDropFiles(*args, **kw):
+        return FileDropTarget.OnDropFiles(*args, **kw)
+    base_OnDropFiles = wx._deprecated(base_OnDropFiles,
+                                   "Please use FileDropTarget.OnDropFiles instead.")

 
 

+    def base_OnEnter(*args, **kw):
+        return FileDropTarget.OnEnter(*args, **kw)
+    base_OnEnter = wx._deprecated(base_OnEnter,
+                                   "Please use FileDropTarget.OnEnter instead.")

 
 

-class FileDropTargetPtr(FileDropTarget):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = FileDropTarget
-_misc_.FileDropTarget_swigregister(FileDropTargetPtr)
+    def base_OnDragOver(*args, **kw):
+        return FileDropTarget.OnDragOver(*args, **kw)
+    base_OnDragOver = wx._deprecated(base_OnDragOver,
+                                   "Please use FileDropTarget.OnDragOver instead.")
+
+    def base_OnLeave(*args, **kw):
+        return FileDropTarget.OnLeave(*args, **kw)
+    base_OnLeave = wx._deprecated(base_OnLeave,
+                                   "Please use FileDropTarget.OnLeave instead.")
+
+    def base_OnDrop(*args, **kw):
+        return FileDropTarget.OnDrop(*args, **kw)
+    base_OnDrop = wx._deprecated(base_OnDrop,
+                                   "Please use FileDropTarget.OnDrop instead.")
+
+    def base_OnData(*args, **kw):
+        return FileDropTarget.OnData(*args, **kw)
+    base_OnData = wx._deprecated(base_OnData,
+                                   "Please use FileDropTarget.OnData instead.")
+
+_misc_.FileDropTarget_swigregister(FileDropTarget)

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 


@@ -5239,20 +5209,13 @@ class Clipboard(_core.Object):
     :see: `wx.DataObject`
 
     """
     :see: `wx.DataObject`
 
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxClipboard 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) -> Clipboard"""
         """__init__(self) -> Clipboard"""

-        newobj = _misc_.new_Clipboard(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Clipboard):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.Clipboard_swiginit(self,_misc_.new_Clipboard(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Clipboard
+    __del__ = lambda self : None;

     def Open(*args, **kwargs):
         """
         Open(self) -> bool
     def Open(*args, **kwargs):
         """
         Open(self) -> bool


@@ -5361,21 +5324,15 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)

+_misc_.Clipboard_swigregister(Clipboard)

 
 

-class ClipboardPtr(Clipboard):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Clipboard
-_misc_.Clipboard_swigregister(ClipboardPtr)
-
-def Clipboard_Get(*args, **kwargs):
-    """
+def Clipboard_Get(*args):
+  """

     Clipboard_Get() -> Clipboard
 
     Returns global instance (wxTheClipboard) of the object.
     """
     Clipboard_Get() -> Clipboard
 
     Returns global instance (wxTheClipboard) of the object.
     """

-    return _misc_.Clipboard_Get(*args, **kwargs)
+  return _misc_.Clipboard_Get(*args)

 
 class _wxPyDelayedInitWrapper(object):
     def __init__(self, initfunc, *args, **kwargs):
 
 class _wxPyDelayedInitWrapper(object):
     def __init__(self, initfunc, *args, **kwargs):


@@ -5385,7 +5342,8 @@ class _wxPyDelayedInitWrapper(object):
         self._instance = None
     def _checkInstance(self):
         if self._instance is None:
         self._instance = None
     def _checkInstance(self):
         if self._instance is None:

-            self._instance = self._initfunc(*self._args, **self._kwargs)        
+            if wx.GetApp():
+                self._instance = self._initfunc(*self._args, **self._kwargs)        

     def __getattr__(self, name):
         self._checkInstance()
         return getattr(self._instance, name)
     def __getattr__(self, name):
         self._checkInstance()
         return getattr(self._instance, name)


@@ -5399,25 +5357,18 @@ class ClipboardLocker(object):
     A helpful class for opening the clipboard and automatically
     closing it when the locker is destroyed.
     """
     A helpful class for opening the clipboard and automatically
     closing it when the locker is destroyed.
     """

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxClipboardLocker 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, Clipboard clipboard=None) -> ClipboardLocker
 
         A helpful class for opening the clipboard and automatically
         closing it when the locker is destroyed.
         """
         """
         __init__(self, Clipboard clipboard=None) -> ClipboardLocker
 
         A helpful class for opening the clipboard and automatically
         closing it when the locker is destroyed.
         """

-        newobj = _misc_.new_ClipboardLocker(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_ClipboardLocker):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.ClipboardLocker_swiginit(self,_misc_.new_ClipboardLocker(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_ClipboardLocker
+    __del__ = lambda self : None;

     def __nonzero__(*args, **kwargs):
         """
         __nonzero__(self) -> bool
     def __nonzero__(*args, **kwargs):
         """
         __nonzero__(self) -> bool


@@ -5427,42 +5378,29 @@ class ClipboardLocker(object):
         """
         return _misc_.ClipboardLocker___nonzero__(*args, **kwargs)
 
         """
         return _misc_.ClipboardLocker___nonzero__(*args, **kwargs)
 

-
-class ClipboardLockerPtr(ClipboardLocker):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = ClipboardLocker
-_misc_.ClipboardLocker_swigregister(ClipboardLockerPtr)
+_misc_.ClipboardLocker_swigregister(ClipboardLocker)

 
 #---------------------------------------------------------------------------
 
 class VideoMode(object):
     """A simple struct containing video mode parameters for a display"""
 
 #---------------------------------------------------------------------------
 
 class VideoMode(object):
     """A simple struct containing video mode parameters for a display"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxVideoMode 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 width=0, int height=0, int depth=0, int freq=0) -> VideoMode
 
         A simple struct containing video mode parameters for a display
         """
         """
         __init__(self, int width=0, int height=0, int depth=0, int freq=0) -> VideoMode
 
         A simple struct containing video mode parameters for a display
         """

-        newobj = _misc_.new_VideoMode(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_VideoMode):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.VideoMode_swiginit(self,_misc_.new_VideoMode(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_VideoMode
+    __del__ = lambda self : None;

     def Matches(*args, **kwargs):
         """
         Matches(self, VideoMode other) -> bool
 
     def Matches(*args, **kwargs):
         """
         Matches(self, VideoMode other) -> bool
 

-        Returns true if this mode matches the other one in the sense that all
-        non zero fields of the other mode have the same value in this
+        Returns True if this mode matches the other one in the sense that all
+        non-zero fields of the other mode have the same value in this

         one (except for refresh which is allowed to have a greater value)
         """
         return _misc_.VideoMode_Matches(*args, **kwargs)
         one (except for refresh which is allowed to have a greater value)
         """
         return _misc_.VideoMode_Matches(*args, **kwargs)


@@ -5479,8 +5417,7 @@ class VideoMode(object):
         """
         GetHeight(self) -> int
 
         """
         GetHeight(self) -> int
 

-        Returns the screen width in pixels (e.g. 640*480), 0 means
-        unspecified
+        Returns the screen height in pixels (e.g. 640*480), 0 means unspecified

         """
         return _misc_.VideoMode_GetHeight(*args, **kwargs)
 
         """
         return _misc_.VideoMode_GetHeight(*args, **kwargs)
 


@@ -5514,19 +5451,13 @@ class VideoMode(object):
     h = property(_misc_.VideoMode_h_get, _misc_.VideoMode_h_set)
     bpp = property(_misc_.VideoMode_bpp_get, _misc_.VideoMode_bpp_set)
     refresh = property(_misc_.VideoMode_refresh_get, _misc_.VideoMode_refresh_set)
     h = property(_misc_.VideoMode_h_get, _misc_.VideoMode_h_set)
     bpp = property(_misc_.VideoMode_bpp_get, _misc_.VideoMode_bpp_set)
     refresh = property(_misc_.VideoMode_refresh_get, _misc_.VideoMode_refresh_set)

-
-class VideoModePtr(VideoMode):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = VideoMode
-_misc_.VideoMode_swigregister(VideoModePtr)
+_misc_.VideoMode_swigregister(VideoMode)

 
 class Display(object):
     """Represents a display/monitor attached to the system"""
 
 class Display(object):
     """Represents a display/monitor attached to the system"""

-    def __repr__(self):
-        return "<%s.%s; proxy of C++ wxDisplay 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, size_t index=0) -> Display
 
         """
         __init__(self, size_t index=0) -> Display
 


@@ -5534,16 +5465,9 @@ class Display(object):
         are numbered from 0 to GetCount() - 1, 0 is always the primary display
         and the only one which is always supported
         """
         are numbered from 0 to GetCount() - 1, 0 is always the primary display
         and the only one which is always supported
         """

-        newobj = _misc_.new_Display(*args, **kwargs)
-        self.this = newobj.this
-        self.thisown = 1
-        del newobj.thisown
-    def __del__(self, destroy=_misc_.delete_Display):
-        """__del__(self)"""
-        try:
-            if self.thisown: destroy(self)
-        except: pass
-
+        _misc_.Display_swiginit(self,_misc_.new_Display(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_Display
+    __del__ = lambda self : None;

     def GetCount(*args, **kwargs):
         """
         GetCount() -> size_t
     def GetCount(*args, **kwargs):
         """
         GetCount() -> size_t


@@ -5591,6 +5515,15 @@ class Display(object):
         """
         return _misc_.Display_GetGeometry(*args, **kwargs)
 
         """
         return _misc_.Display_GetGeometry(*args, **kwargs)
 

+    def GetClientArea(*args, **kwargs):
+        """
+        GetClientArea(self) -> Rect
+
+        Returns the bounding rectangle the client area of the display,
+        i.e., without taskbars and such.
+        """
+        return _misc_.Display_GetClientArea(*args, **kwargs)
+

     def GetName(*args, **kwargs):
         """
         GetName(self) -> String
     def GetName(*args, **kwargs):
         """
         GetName(self) -> String


@@ -5603,7 +5536,7 @@ class Display(object):
         """
         IsPrimary(self) -> bool
 
         """
         IsPrimary(self) -> bool
 

-        Returns true if the display is the primary display. The primary
+        Returns True if the display is the primary display. The primary

         display is the one whose index is 0.
         """
         return _misc_.Display_IsPrimary(*args, **kwargs)
         display is the one whose index is 0.
         """
         return _misc_.Display_IsPrimary(*args, **kwargs)


@@ -5634,7 +5567,22 @@ class Display(object):
         """
         ChangeMode(self, VideoMode mode=DefaultVideoMode) -> bool
 
         """
         ChangeMode(self, VideoMode mode=DefaultVideoMode) -> bool
 

-        Change current mode, return true if succeeded, false otherwise
+        Changes the video mode of this display to the mode specified in the
+        mode parameter.
+
+        If wx.DefaultVideoMode is passed in as the mode parameter, the defined
+        behaviour is that wx.Display will reset the video mode to the default
+        mode used by the display.  On Windows, the behavior is normal.
+        However, there are differences on other platforms. On Unix variations
+        using X11 extensions it should behave as defined, but some
+        irregularities may occur.
+
+        On wxMac passing in wx.DefaultVideoMode as the mode parameter does
+        nothing.  This happens because Carbon no longer has access to
+        DMUseScreenPrefs, an undocumented function that changed the video mode
+        to the system default by using the system's 'scrn' resource.
+
+        Returns True if succeeded, False otherwise

         """
         return _misc_.Display_ChangeMode(*args, **kwargs)
 
         """
         return _misc_.Display_ChangeMode(*args, **kwargs)
 


@@ -5646,39 +5594,282 @@ class Display(object):
         """
         return _misc_.Display_ResetMode(*args, **kwargs)
 
         """
         return _misc_.Display_ResetMode(*args, **kwargs)
 

-
-class DisplayPtr(Display):
-    def __init__(self, this):
-        self.this = this
-        if not hasattr(self,"thisown"): self.thisown = 0
-        self.__class__ = Display
-_misc_.Display_swigregister(DisplayPtr)
+_misc_.Display_swigregister(Display)

 DefaultVideoMode = cvar.DefaultVideoMode
 
 DefaultVideoMode = cvar.DefaultVideoMode
 

-def Display_GetCount(*args, **kwargs):
-    """
+def Display_GetCount(*args):
+  """

     Display_GetCount() -> size_t
 
     Return the number of available displays.
     """
     Display_GetCount() -> size_t
 
     Return the number of available displays.
     """

-    return _misc_.Display_GetCount(*args, **kwargs)
+  return _misc_.Display_GetCount(*args)

 
 def Display_GetFromPoint(*args, **kwargs):
 
 def Display_GetFromPoint(*args, **kwargs):

-    """
+  """

     Display_GetFromPoint(Point pt) -> int
 
     Find the display where the given point lies, return wx.NOT_FOUND if it
     doesn't belong to any display
     """
     Display_GetFromPoint(Point pt) -> int
 
     Find the display where the given point lies, return wx.NOT_FOUND if it
     doesn't belong to any display
     """

-    return _misc_.Display_GetFromPoint(*args, **kwargs)
+  return _misc_.Display_GetFromPoint(*args, **kwargs)

 
 def Display_GetFromWindow(*args, **kwargs):
 
 def Display_GetFromWindow(*args, **kwargs):

-    """
+  """

     Display_GetFromWindow(Window window) -> int
 
     Find the display where the given window lies, return wx.NOT_FOUND if
     it is not shown at all.
     """
     Display_GetFromWindow(Window window) -> int
 
     Find the display where the given window lies, return wx.NOT_FOUND if
     it is not shown at all.
     """

-    return _misc_.Display_GetFromWindow(*args, **kwargs)
+  return _misc_.Display_GetFromWindow(*args, **kwargs)
+
+#---------------------------------------------------------------------------
+
+class StandardPaths(object):
+    """
+    wx.StandardPaths returns standard locations in the file system and
+    should be used by programs to find their data files in a portable way.
+
+    In the description of the methods below, the example return values are
+    given for the Unix, Windows and Mac OS X systems, however please note
+    that these are just  examples and the actual values may differ. For
+    example, under Windows the system administrator may change the
+    standard directories locations, i.e. the Windows directory may be
+    named W:\Win2003 instead of the default C:\Windows.
+
+    The strings appname and username should be replaced with the value
+    returned by `wx.App.GetAppName` and the name of the currently logged
+    in user, respectively. The string prefix is only used under Unix and
+    is /usr/local by default but may be changed using `SetInstallPrefix`.
+
+    The directories returned by the methods of this class may or may not
+    exist. If they don't exist, it's up to the caller to create them,
+    wx.StandardPaths doesn't do it.
+
+    Finally note that these functions only work with standardly packaged
+    applications. I.e. under Unix you should follow the standard
+    installation conventions and under Mac you should create your
+    application bundle according to the Apple guidelines. Again, this
+    class doesn't help you to do it.
+    """
+    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
+    ResourceCat_None = _misc_.StandardPaths_ResourceCat_None
+    ResourceCat_Messages = _misc_.StandardPaths_ResourceCat_Messages
+    ResourceCat_Max = _misc_.StandardPaths_ResourceCat_Max
+    def Get(*args, **kwargs):
+        """
+        Get() -> StandardPaths
+
+        Return the global standard paths singleton
+        """
+        return _misc_.StandardPaths_Get(*args, **kwargs)
+
+    Get = staticmethod(Get)
+    def GetConfigDir(*args, **kwargs):
+        """
+        GetConfigDir(self) -> String
+
+        Return the directory with system config files: /etc under Unix,
+        'c:\Documents and Settings\All Users\Application Data' under Windows,
+        /Library/Preferences for Mac
+        """
+        return _misc_.StandardPaths_GetConfigDir(*args, **kwargs)
+
+    def GetUserConfigDir(*args, **kwargs):
+        """
+        GetUserConfigDir(self) -> String
+
+        Return the directory for the user config files: $HOME under Unix,
+        'c:\Documents and Settings\username' under Windows, and 
+        ~/Library/Preferences under Mac
+            
+        Only use this if you have a single file to put there, otherwise
+        `GetUserDataDir` is more appropriate
+        """
+        return _misc_.StandardPaths_GetUserConfigDir(*args, **kwargs)
+
+    def GetDataDir(*args, **kwargs):
+        """
+        GetDataDir(self) -> String
+
+        Return the location of the application's global, (i.e. not
+        user-specific,) data files: prefix/share/appname under Unix,
+        'c:\Program Files\appname' under Windows,
+        appname.app/Contents/SharedSupport app bundle directory under Mac.
+        """
+        return _misc_.StandardPaths_GetDataDir(*args, **kwargs)
+
+    def GetLocalDataDir(*args, **kwargs):
+        """
+        GetLocalDataDir(self) -> String
+
+        Return the location for application data files which are
+        host-specific.  Same as `GetDataDir` except under Unix where it is
+        /etc/appname
+        """
+        return _misc_.StandardPaths_GetLocalDataDir(*args, **kwargs)
+
+    def GetUserDataDir(*args, **kwargs):
+        """
+        GetUserDataDir(self) -> String
+
+        Return the directory for the user-dependent application data files:
+        $HOME/.appname under Unix, c:\Documents and
+        Settings\username\Application Data\appname under Windows and
+        ~/Library/Application Support/appname under Mac
+        """
+        return _misc_.StandardPaths_GetUserDataDir(*args, **kwargs)
+
+    def GetUserLocalDataDir(*args, **kwargs):
+        """
+        GetUserLocalDataDir(self) -> String
+
+        Return the directory for user data files which shouldn't be shared
+        with the other machines
+
+        Same as `GetUserDataDir` for all platforms except Windows where it is
+        the 'Local Settings\Application Data\appname' directory.
+        """
+        return _misc_.StandardPaths_GetUserLocalDataDir(*args, **kwargs)
+
+    def GetPluginsDir(*args, **kwargs):
+        """
+        GetPluginsDir(self) -> String
+
+        Return the directory where the loadable modules (plugins) live:
+        prefix/lib/appname under Unix, program directory under Windows and
+        Contents/Plugins app bundle subdirectory under Mac
+        """
+        return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
+
+    def GetResourcesDir(*args, **kwargs):
+        """
+        GetResourcesDir(self) -> String
+
+        Get resources directory.  Resources are auxiliary files used by the
+        application and include things like image and sound files.
+
+        Same as `GetDataDir` for all platforms except Mac where it returns
+        Contents/Resources subdirectory of the app bundle.
+        """
+        return _misc_.StandardPaths_GetResourcesDir(*args, **kwargs)
+
+    def GetLocalizedResourcesDir(*args, **kwargs):
+        """
+        GetLocalizedResourcesDir(self, String lang, int category=ResourceCat_None) -> String
+
+        Get localized resources directory containing the resource files of the
+        specified category for the given language.
+
+        In general this is just GetResourcesDir()/lang under Windows and Unix
+        and GetResourcesDir()/lang.lproj under Mac but is something quite
+        different under Unix for the message catalog category (namely the
+        standard prefix/share/locale/lang/LC_MESSAGES.)
+        """
+        return _misc_.StandardPaths_GetLocalizedResourcesDir(*args, **kwargs)
+
+    def GetDocumentsDir(*args, **kwargs):
+        """
+        GetDocumentsDir(self) -> String
+
+        Return the Documents directory for the current user.
+
+        C:\Documents and Settings\username\Documents under Windows,
+        $HOME under Unix and ~/Documents under Mac
+        """
+        return _misc_.StandardPaths_GetDocumentsDir(*args, **kwargs)
+
+    def SetInstallPrefix(*args, **kwargs):
+        """
+        SetInstallPrefix(self, String prefix)
+
+        Set the program installation directory which is /usr/local by default.
+        This value will be used by other methods such as `GetDataDir` and
+        `GetPluginsDir` as the prefix for what they return. (This function
+        only has meaning on Unix systems.)
+        """
+        return _misc_.StandardPaths_SetInstallPrefix(*args, **kwargs)
+
+    def GetInstallPrefix(*args, **kwargs):
+        """
+        GetInstallPrefix(self) -> String
+
+        Get the program installation prefix. The default is the prefix where
+        Python is installed. (This function only has meaning on Unix systems.)
+        """
+        return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs)
+
+_misc_.StandardPaths_swigregister(StandardPaths)
+
+def StandardPaths_Get(*args):
+  """
+    StandardPaths_Get() -> StandardPaths
+
+    Return the global standard paths singleton
+    """
+  return _misc_.StandardPaths_Get(*args)
+
+#---------------------------------------------------------------------------
+
+POWER_SOCKET = _misc_.POWER_SOCKET
+POWER_BATTERY = _misc_.POWER_BATTERY
+POWER_UNKNOWN = _misc_.POWER_UNKNOWN
+BATTERY_NORMAL_STATE = _misc_.BATTERY_NORMAL_STATE
+BATTERY_LOW_STATE = _misc_.BATTERY_LOW_STATE
+BATTERY_CRITICAL_STATE = _misc_.BATTERY_CRITICAL_STATE
+BATTERY_SHUTDOWN_STATE = _misc_.BATTERY_SHUTDOWN_STATE
+BATTERY_UNKNOWN_STATE = _misc_.BATTERY_UNKNOWN_STATE
+class PowerEvent(_core.Event):
+    """
+    wx.PowerEvent is generated when the system online status changes.
+    Currently this is only implemented for Windows.
+    """
+    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, EventType evtType) -> PowerEvent
+
+        wx.PowerEvent is generated when the system online status changes.
+        Currently this is only implemented for Windows.
+        """
+        _misc_.PowerEvent_swiginit(self,_misc_.new_PowerEvent(*args, **kwargs))
+    def Veto(*args, **kwargs):
+        """Veto(self)"""
+        return _misc_.PowerEvent_Veto(*args, **kwargs)
+
+    def IsVetoed(*args, **kwargs):
+        """IsVetoed(self) -> bool"""
+        return _misc_.PowerEvent_IsVetoed(*args, **kwargs)
+
+_misc_.PowerEvent_swigregister(PowerEvent)
+
+wxEVT_POWER_SUSPENDING = _misc_.wxEVT_POWER_SUSPENDING
+wxEVT_POWER_SUSPENDED = _misc_.wxEVT_POWER_SUSPENDED
+wxEVT_POWER_SUSPEND_CANCEL = _misc_.wxEVT_POWER_SUSPEND_CANCEL
+wxEVT_POWER_RESUME = _misc_.wxEVT_POWER_RESUME
+EVT_POWER_SUSPENDING       = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
+EVT_POWER_SUSPENDED        = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
+EVT_POWER_SUSPEND_CANCEL   = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
+EVT_POWER_RESUME           = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
+
+
+def GetPowerType(*args):
+  """
+    GetPowerType() -> int
+
+    return the current system power state: online or offline
+    """
+  return _misc_.GetPowerType(*args)
+
+def GetBatteryState(*args):
+  """
+    GetBatteryState() -> int
+
+    return approximate battery state
+    """
+  return _misc_.GetBatteryState(*args)