]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/msw/_misc.py
bitwise vs. logical operator
[wxWidgets.git] / wxPython / src / msw / _misc.py
index 01505bf8b0dd698836b9e8edd4590b10fab2787a..770b525994cc26ac600a4238b1b36b5f38370b89 100644 (file)
@@ -182,8 +182,7 @@ class SystemSettings(object):
         return _misc_.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)
         return _misc_.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)
-SystemSettings_swigregister = _misc_.SystemSettings_swigregister
-SystemSettings_swigregister(SystemSettings)
+_misc_.SystemSettings_swigregister(SystemSettings)
 
 def SystemSettings_GetColour(*args, **kwargs):
   """SystemSettings_GetColour(int index) -> Colour"""
 
 def SystemSettings_GetColour(*args, **kwargs):
   """SystemSettings_GetColour(int index) -> Colour"""
@@ -246,8 +245,7 @@ class SystemOptions(_core.Object):
         return _misc_.SystemOptions_IsFalse(*args, **kwargs)
 
     IsFalse = staticmethod(IsFalse)
         return _misc_.SystemOptions_IsFalse(*args, **kwargs)
 
     IsFalse = staticmethod(IsFalse)
-SystemOptions_swigregister = _misc_.SystemOptions_swigregister
-SystemOptions_swigregister(SystemOptions)
+_misc_.SystemOptions_swigregister(SystemOptions)
 cvar = _misc_.cvar
 WINDOW_DEFAULT_VARIANT = cvar.WINDOW_DEFAULT_VARIANT
 
 cvar = _misc_.cvar
 WINDOW_DEFAULT_VARIANT = cvar.WINDOW_DEFAULT_VARIANT
 
@@ -297,10 +295,18 @@ def IsStockID(*args, **kwargs):
 def IsStockLabel(*args, **kwargs):
   """IsStockLabel(int id, String label) -> bool"""
   return _misc_.IsStockLabel(*args, **kwargs)
 def IsStockLabel(*args, **kwargs):
   """IsStockLabel(int id, String label) -> bool"""
   return _misc_.IsStockLabel(*args, **kwargs)
+STOCK_NOFLAGS = _misc_.STOCK_NOFLAGS
+STOCK_WITH_MNEMONIC = _misc_.STOCK_WITH_MNEMONIC
+STOCK_WITH_ACCELERATOR = _misc_.STOCK_WITH_ACCELERATOR
 
 def GetStockLabel(*args, **kwargs):
 
 def GetStockLabel(*args, **kwargs):
-  """GetStockLabel(int id, bool withCodes=True, String accelerator=EmptyString) -> String"""
+  """GetStockLabel(int id, long flags=STOCK_WITH_MNEMONIC) -> String"""
   return _misc_.GetStockLabel(*args, **kwargs)
   return _misc_.GetStockLabel(*args, **kwargs)
+STOCK_MENU = _misc_.STOCK_MENU
+
+def GetStockHelpString(*args, **kwargs):
+  """GetStockHelpString(int id, int client=STOCK_MENU) -> String"""
+  return _misc_.GetStockHelpString(*args, **kwargs)
 
 def Bell(*args):
   """Bell()"""
 
 def Bell(*args):
   """Bell()"""
@@ -339,6 +345,14 @@ def GetOsDescription(*args):
   """GetOsDescription() -> String"""
   return _misc_.GetOsDescription(*args)
 
   """GetOsDescription() -> String"""
   return _misc_.GetOsDescription(*args)
 
+def IsPlatformLittleEndian(*args):
+  """IsPlatformLittleEndian() -> bool"""
+  return _misc_.IsPlatformLittleEndian(*args)
+
+def IsPlatform64Bit(*args):
+  """IsPlatform64Bit() -> bool"""
+  return _misc_.IsPlatform64Bit(*args)
+
 def GetFreeMemory(*args):
   """GetFreeMemory() -> wxMemorySize"""
   return _misc_.GetFreeMemory(*args)
 def GetFreeMemory(*args):
   """GetFreeMemory() -> wxMemorySize"""
   return _misc_.GetFreeMemory(*args)
@@ -434,7 +448,7 @@ def SaveFileSelector(*args, **kwargs):
 def DirSelector(*args, **kwargs):
   """
     DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 
 def DirSelector(*args, **kwargs):
   """
     DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 
-        long style=DD_DEFAULT_STYLE, 
+        long style=wxDD_DEFAULT_STYLE, 
         Point pos=DefaultPosition, Window parent=None) -> String
     """
   return _misc_.DirSelector(*args, **kwargs)
         Point pos=DefaultPosition, Window parent=None) -> String
     """
   return _misc_.DirSelector(*args, **kwargs)
@@ -478,6 +492,14 @@ def MessageBox(*args, **kwargs):
     """
   return _misc_.MessageBox(*args, **kwargs)
 
     """
   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)
+
 def ColourDisplay(*args):
   """ColourDisplay() -> bool"""
   return _misc_.ColourDisplay(*args)
 def ColourDisplay(*args):
   """ColourDisplay() -> bool"""
   return _misc_.ColourDisplay(*args)
@@ -693,8 +715,7 @@ class MouseState(object):
     metaDown = property(MetaDown, SetMetaDown)
     cmdDown = property(CmdDown)
 
     metaDown = property(MetaDown, SetMetaDown)
     cmdDown = property(CmdDown)
 
-MouseState_swigregister = _misc_.MouseState_swigregister
-MouseState_swigregister(MouseState)
+_misc_.MouseState_swigregister(MouseState)
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
 FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
 DirSelectorPromptStr = cvar.DirSelectorPromptStr
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
 FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
 DirSelectorPromptStr = cvar.DirSelectorPromptStr
@@ -731,8 +752,7 @@ class MutexGuiLocker(object):
         _misc_.MutexGuiLocker_swiginit(self,_misc_.new_MutexGuiLocker(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_MutexGuiLocker
     __del__ = lambda self : None;
         _misc_.MutexGuiLocker_swiginit(self,_misc_.new_MutexGuiLocker(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_MutexGuiLocker
     __del__ = lambda self : None;
-MutexGuiLocker_swigregister = _misc_.MutexGuiLocker_swigregister
-MutexGuiLocker_swigregister(MutexGuiLocker)
+_misc_.MutexGuiLocker_swigregister(MutexGuiLocker)
 
 
 def Thread_IsMain(*args):
 
 
 def Thread_IsMain(*args):
@@ -771,8 +791,9 @@ class ToolTip(_core.Object):
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)
-ToolTip_swigregister = _misc_.ToolTip_swigregister
-ToolTip_swigregister(ToolTip)
+    Tip = property(GetTip,SetTip,doc="See `GetTip` and `SetTip`") 
+    Window = property(GetWindow,doc="See `GetWindow`") 
+_misc_.ToolTip_swigregister(ToolTip)
 
 def ToolTip_Enable(*args, **kwargs):
   """ToolTip_Enable(bool flag)"""
 
 def ToolTip_Enable(*args, **kwargs):
   """ToolTip_Enable(bool flag)"""
@@ -797,9 +818,8 @@ class Caret(object):
 
         Deletes the C++ object this Python object is a proxy for.
         """
 
         Deletes the C++ object this Python object is a proxy for.
         """
-        val = _misc_.Caret_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _misc_.Caret_Destroy(*args, **kwargs)
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
@@ -864,8 +884,10 @@ class Caret(object):
         return _misc_.Caret_SetBlinkTime(*args, **kwargs)
 
     SetBlinkTime = staticmethod(SetBlinkTime)
         return _misc_.Caret_SetBlinkTime(*args, **kwargs)
 
     SetBlinkTime = staticmethod(SetBlinkTime)
-Caret_swigregister = _misc_.Caret_swigregister
-Caret_swigregister(Caret)
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+    Window = property(GetWindow,doc="See `GetWindow`") 
+_misc_.Caret_swigregister(Caret)
 
 def Caret_GetBlinkTime(*args):
   """Caret_GetBlinkTime() -> int"""
 
 def Caret_GetBlinkTime(*args):
   """Caret_GetBlinkTime() -> int"""
@@ -884,8 +906,7 @@ class BusyCursor(object):
         _misc_.BusyCursor_swiginit(self,_misc_.new_BusyCursor(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyCursor
     __del__ = lambda self : None;
         _misc_.BusyCursor_swiginit(self,_misc_.new_BusyCursor(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyCursor
     __del__ = lambda self : None;
-BusyCursor_swigregister = _misc_.BusyCursor_swigregister
-BusyCursor_swigregister(BusyCursor)
+_misc_.BusyCursor_swigregister(BusyCursor)
 
 class WindowDisabler(object):
     """Proxy of C++ WindowDisabler class"""
 
 class WindowDisabler(object):
     """Proxy of C++ WindowDisabler class"""
@@ -896,8 +917,7 @@ class WindowDisabler(object):
         _misc_.WindowDisabler_swiginit(self,_misc_.new_WindowDisabler(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_WindowDisabler
     __del__ = lambda self : None;
         _misc_.WindowDisabler_swiginit(self,_misc_.new_WindowDisabler(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_WindowDisabler
     __del__ = lambda self : None;
-WindowDisabler_swigregister = _misc_.WindowDisabler_swigregister
-WindowDisabler_swigregister(WindowDisabler)
+_misc_.WindowDisabler_swigregister(WindowDisabler)
 
 class BusyInfo(_core.Object):
     """Proxy of C++ BusyInfo class"""
 
 class BusyInfo(_core.Object):
     """Proxy of C++ BusyInfo class"""
@@ -908,8 +928,8 @@ class BusyInfo(_core.Object):
         _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyInfo
     __del__ = lambda self : None;
         _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyInfo
     __del__ = lambda self : None;
-BusyInfo_swigregister = _misc_.BusyInfo_swigregister
-BusyInfo_swigregister(BusyInfo)
+    def Destroy(self): pass 
+_misc_.BusyInfo_swigregister(BusyInfo)
 
 class StopWatch(object):
     """Proxy of C++ StopWatch class"""
 
 class StopWatch(object):
     """Proxy of C++ StopWatch class"""
@@ -918,6 +938,8 @@ class StopWatch(object):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> StopWatch"""
         _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> StopWatch"""
         _misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_StopWatch
+    __del__ = lambda self : None;
     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)
@@ -934,8 +956,7 @@ class StopWatch(object):
         """Time(self) -> long"""
         return _misc_.StopWatch_Time(*args, **kwargs)
 
         """Time(self) -> long"""
         return _misc_.StopWatch_Time(*args, **kwargs)
 
-StopWatch_swigregister = _misc_.StopWatch_swigregister
-StopWatch_swigregister(StopWatch)
+_misc_.StopWatch_swigregister(StopWatch)
 
 class FileHistory(_core.Object):
     """Proxy of C++ FileHistory class"""
 
 class FileHistory(_core.Object):
     """Proxy of C++ FileHistory class"""
@@ -991,8 +1012,11 @@ class FileHistory(_core.Object):
         return _misc_.FileHistory_GetCount(*args, **kwargs)
 
     GetNoHistoryFiles = GetCount 
         return _misc_.FileHistory_GetCount(*args, **kwargs)
 
     GetNoHistoryFiles = GetCount 
-FileHistory_swigregister = _misc_.FileHistory_swigregister
-FileHistory_swigregister(FileHistory)
+    Count = property(GetCount,doc="See `GetCount`") 
+    HistoryFile = property(GetHistoryFile,doc="See `GetHistoryFile`") 
+    MaxFiles = property(GetMaxFiles,doc="See `GetMaxFiles`") 
+    NoHistoryFiles = property(GetNoHistoryFiles,doc="See `GetNoHistoryFiles`") 
+_misc_.FileHistory_swigregister(FileHistory)
 
 class SingleInstanceChecker(object):
     """Proxy of C++ SingleInstanceChecker class"""
 
 class SingleInstanceChecker(object):
     """Proxy of C++ SingleInstanceChecker class"""
@@ -1011,14 +1035,184 @@ class SingleInstanceChecker(object):
         """IsAnotherRunning(self) -> bool"""
         return _misc_.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
 
         """IsAnotherRunning(self) -> bool"""
         return _misc_.SingleInstanceChecker_IsAnotherRunning(*args, **kwargs)
 
-SingleInstanceChecker_swigregister = _misc_.SingleInstanceChecker_swigregister
-SingleInstanceChecker_swigregister(SingleInstanceChecker)
+_misc_.SingleInstanceChecker_swigregister(SingleInstanceChecker)
 
 def PreSingleInstanceChecker(*args, **kwargs):
     """PreSingleInstanceChecker() -> SingleInstanceChecker"""
     val = _misc_.new_PreSingleInstanceChecker(*args, **kwargs)
     return val
 
 
 def PreSingleInstanceChecker(*args, **kwargs):
     """PreSingleInstanceChecker() -> SingleInstanceChecker"""
     val = _misc_.new_PreSingleInstanceChecker(*args, **kwargs)
     return val
 
+#---------------------------------------------------------------------------
+
+OS_UNKNOWN = _misc_.OS_UNKNOWN
+OS_MAC_OS = _misc_.OS_MAC_OS
+OS_MAC_OSX_DARWIN = _misc_.OS_MAC_OSX_DARWIN
+OS_MAC = _misc_.OS_MAC
+OS_WINDOWS_9X = _misc_.OS_WINDOWS_9X
+OS_WINDOWS_NT = _misc_.OS_WINDOWS_NT
+OS_WINDOWS_MICRO = _misc_.OS_WINDOWS_MICRO
+OS_WINDOWS_CE = _misc_.OS_WINDOWS_CE
+OS_WINDOWS = _misc_.OS_WINDOWS
+OS_UNIX_LINUX = _misc_.OS_UNIX_LINUX
+OS_UNIX_FREEBSD = _misc_.OS_UNIX_FREEBSD
+OS_UNIX_OPENBSD = _misc_.OS_UNIX_OPENBSD
+OS_UNIX_NETBSD = _misc_.OS_UNIX_NETBSD
+OS_UNIX_SOLARIS = _misc_.OS_UNIX_SOLARIS
+OS_UNIX_AIX = _misc_.OS_UNIX_AIX
+OS_UNIX_HPUX = _misc_.OS_UNIX_HPUX
+OS_UNIX = _misc_.OS_UNIX
+OS_DOS = _misc_.OS_DOS
+OS_OS2 = _misc_.OS_OS2
+PORT_UNKNOWN = _misc_.PORT_UNKNOWN
+PORT_BASE = _misc_.PORT_BASE
+PORT_MSW = _misc_.PORT_MSW
+PORT_MOTIF = _misc_.PORT_MOTIF
+PORT_GTK = _misc_.PORT_GTK
+PORT_MGL = _misc_.PORT_MGL
+PORT_X11 = _misc_.PORT_X11
+PORT_PM = _misc_.PORT_PM
+PORT_OS2 = _misc_.PORT_OS2
+PORT_MAC = _misc_.PORT_MAC
+PORT_COCOA = _misc_.PORT_COCOA
+PORT_WINCE = _misc_.PORT_WINCE
+PORT_PALMOS = _misc_.PORT_PALMOS
+PORT_DFB = _misc_.PORT_DFB
+ARCH_INVALID = _misc_.ARCH_INVALID
+ARCH_32 = _misc_.ARCH_32
+ARCH_64 = _misc_.ARCH_64
+ARCH_MAX = _misc_.ARCH_MAX
+ENDIAN_INVALID = _misc_.ENDIAN_INVALID
+ENDIAN_BIG = _misc_.ENDIAN_BIG
+ENDIAN_LITTLE = _misc_.ENDIAN_LITTLE
+ENDIAN_PDP = _misc_.ENDIAN_PDP
+ENDIAN_MAX = _misc_.ENDIAN_MAX
+class PlatformInformation(object):
+    """Proxy of C++ PlatformInformation 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) -> PlatformInformation"""
+        _misc_.PlatformInformation_swiginit(self,_misc_.new_PlatformInformation(*args, **kwargs))
+    def __eq__(*args, **kwargs):
+        """__eq__(self, PlatformInformation t) -> bool"""
+        return _misc_.PlatformInformation___eq__(*args, **kwargs)
+
+    def __ne__(*args, **kwargs):
+        """__ne__(self, PlatformInformation t) -> bool"""
+        return _misc_.PlatformInformation___ne__(*args, **kwargs)
+
+    def GetOSMajorVersion(*args, **kwargs):
+        """GetOSMajorVersion(self) -> int"""
+        return _misc_.PlatformInformation_GetOSMajorVersion(*args, **kwargs)
+
+    def GetOSMinorVersion(*args, **kwargs):
+        """GetOSMinorVersion(self) -> int"""
+        return _misc_.PlatformInformation_GetOSMinorVersion(*args, **kwargs)
+
+    def CheckOSVersion(*args, **kwargs):
+        """CheckOSVersion(self, int major, int minor) -> bool"""
+        return _misc_.PlatformInformation_CheckOSVersion(*args, **kwargs)
+
+    def GetToolkitMajorVersion(*args, **kwargs):
+        """GetToolkitMajorVersion(self) -> int"""
+        return _misc_.PlatformInformation_GetToolkitMajorVersion(*args, **kwargs)
+
+    def GetToolkitMinorVersion(*args, **kwargs):
+        """GetToolkitMinorVersion(self) -> int"""
+        return _misc_.PlatformInformation_GetToolkitMinorVersion(*args, **kwargs)
+
+    def CheckToolkitVersion(*args, **kwargs):
+        """CheckToolkitVersion(self, int major, int minor) -> bool"""
+        return _misc_.PlatformInformation_CheckToolkitVersion(*args, **kwargs)
+
+    def IsUsingUniversalWidgets(*args, **kwargs):
+        """IsUsingUniversalWidgets(self) -> bool"""
+        return _misc_.PlatformInformation_IsUsingUniversalWidgets(*args, **kwargs)
+
+    def GetOperatingSystemId(*args, **kwargs):
+        """GetOperatingSystemId(self) -> int"""
+        return _misc_.PlatformInformation_GetOperatingSystemId(*args, **kwargs)
+
+    def GetPortId(*args, **kwargs):
+        """GetPortId(self) -> int"""
+        return _misc_.PlatformInformation_GetPortId(*args, **kwargs)
+
+    def GetArchitecture(*args, **kwargs):
+        """GetArchitecture(self) -> int"""
+        return _misc_.PlatformInformation_GetArchitecture(*args, **kwargs)
+
+    def GetEndianness(*args, **kwargs):
+        """GetEndianness(self) -> int"""
+        return _misc_.PlatformInformation_GetEndianness(*args, **kwargs)
+
+    def GetOperatingSystemFamilyName(*args, **kwargs):
+        """GetOperatingSystemFamilyName(self) -> String"""
+        return _misc_.PlatformInformation_GetOperatingSystemFamilyName(*args, **kwargs)
+
+    def GetOperatingSystemIdName(*args, **kwargs):
+        """GetOperatingSystemIdName(self) -> String"""
+        return _misc_.PlatformInformation_GetOperatingSystemIdName(*args, **kwargs)
+
+    def GetPortIdName(*args, **kwargs):
+        """GetPortIdName(self) -> String"""
+        return _misc_.PlatformInformation_GetPortIdName(*args, **kwargs)
+
+    def GetPortIdShortName(*args, **kwargs):
+        """GetPortIdShortName(self) -> String"""
+        return _misc_.PlatformInformation_GetPortIdShortName(*args, **kwargs)
+
+    def GetArchName(*args, **kwargs):
+        """GetArchName(self) -> String"""
+        return _misc_.PlatformInformation_GetArchName(*args, **kwargs)
+
+    def GetEndiannessName(*args, **kwargs):
+        """GetEndiannessName(self) -> String"""
+        return _misc_.PlatformInformation_GetEndiannessName(*args, **kwargs)
+
+    def SetOSVersion(*args, **kwargs):
+        """SetOSVersion(self, int major, int minor)"""
+        return _misc_.PlatformInformation_SetOSVersion(*args, **kwargs)
+
+    def SetToolkitVersion(*args, **kwargs):
+        """SetToolkitVersion(self, int major, int minor)"""
+        return _misc_.PlatformInformation_SetToolkitVersion(*args, **kwargs)
+
+    def SetOperatingSystemId(*args, **kwargs):
+        """SetOperatingSystemId(self, int n)"""
+        return _misc_.PlatformInformation_SetOperatingSystemId(*args, **kwargs)
+
+    def SetPortId(*args, **kwargs):
+        """SetPortId(self, int n)"""
+        return _misc_.PlatformInformation_SetPortId(*args, **kwargs)
+
+    def SetArchitecture(*args, **kwargs):
+        """SetArchitecture(self, int n)"""
+        return _misc_.PlatformInformation_SetArchitecture(*args, **kwargs)
+
+    def SetEndianness(*args, **kwargs):
+        """SetEndianness(self, int n)"""
+        return _misc_.PlatformInformation_SetEndianness(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _misc_.PlatformInformation_IsOk(*args, **kwargs)
+
+    ArchName = property(GetArchName,doc="See `GetArchName`") 
+    Architecture = property(GetArchitecture,SetArchitecture,doc="See `GetArchitecture` and `SetArchitecture`") 
+    Endianness = property(GetEndianness,SetEndianness,doc="See `GetEndianness` and `SetEndianness`") 
+    EndiannessName = property(GetEndiannessName,doc="See `GetEndiannessName`") 
+    OSMajorVersion = property(GetOSMajorVersion,doc="See `GetOSMajorVersion`") 
+    OSMinorVersion = property(GetOSMinorVersion,doc="See `GetOSMinorVersion`") 
+    OperatingSystemFamilyName = property(GetOperatingSystemFamilyName,doc="See `GetOperatingSystemFamilyName`") 
+    OperatingSystemId = property(GetOperatingSystemId,SetOperatingSystemId,doc="See `GetOperatingSystemId` and `SetOperatingSystemId`") 
+    OperatingSystemIdName = property(GetOperatingSystemIdName,doc="See `GetOperatingSystemIdName`") 
+    PortId = property(GetPortId,SetPortId,doc="See `GetPortId` and `SetPortId`") 
+    PortIdName = property(GetPortIdName,doc="See `GetPortIdName`") 
+    PortIdShortName = property(GetPortIdShortName,doc="See `GetPortIdShortName`") 
+    ToolkitMajorVersion = property(GetToolkitMajorVersion,doc="See `GetToolkitMajorVersion`") 
+    ToolkitMinorVersion = property(GetToolkitMinorVersion,doc="See `GetToolkitMinorVersion`") 
+_misc_.PlatformInformation_swigregister(PlatformInformation)
+
 
 def DrawWindowOnDC(*args, **kwargs):
   """DrawWindowOnDC(Window window, DC dc) -> bool"""
 
 def DrawWindowOnDC(*args, **kwargs):
   """DrawWindowOnDC(Window window, DC dc) -> bool"""
@@ -1044,8 +1238,9 @@ 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)
 
-TipProvider_swigregister = _misc_.TipProvider_swigregister
-TipProvider_swigregister(TipProvider)
+    CurrentTip = property(GetCurrentTip,doc="See `GetCurrentTip`") 
+    Tip = property(GetTip,doc="See `GetTip`") 
+_misc_.TipProvider_swigregister(TipProvider)
 
 class PyTipProvider(TipProvider):
     """Proxy of C++ PyTipProvider class"""
 
 class PyTipProvider(TipProvider):
     """Proxy of C++ PyTipProvider class"""
@@ -1054,14 +1249,13 @@ class PyTipProvider(TipProvider):
     def __init__(self, *args, **kwargs): 
         """__init__(self, size_t currentTip) -> PyTipProvider"""
         _misc_.PyTipProvider_swiginit(self,_misc_.new_PyTipProvider(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, size_t currentTip) -> PyTipProvider"""
         _misc_.PyTipProvider_swiginit(self,_misc_.new_PyTipProvider(*args, **kwargs))
-        self._setCallbackInfo(self, PyTipProvider)
+        PyTipProvider._setCallbackInfo(self, self, PyTipProvider)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTipProvider__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTipProvider__setCallbackInfo(*args, **kwargs)
 
-PyTipProvider_swigregister = _misc_.PyTipProvider_swigregister
-PyTipProvider_swigregister(PyTipProvider)
+_misc_.PyTipProvider_swigregister(PyTipProvider)
 
 
 def ShowTip(*args, **kwargs):
 
 
 def ShowTip(*args, **kwargs):
@@ -1083,12 +1277,12 @@ class Timer(_core.EvtHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self, EvtHandler owner=None, int id=ID_ANY) -> Timer"""
         _misc_.Timer_swiginit(self,_misc_.new_Timer(*args, **kwargs))
     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)
+        self._setOORInfo(self,0); self.this.own(True); Timer._setCallbackInfo(self, self, Timer)
 
     __swig_destroy__ = _misc_.delete_Timer
     __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
 
     __swig_destroy__ = _misc_.delete_Timer
     __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
         return _misc_.Timer__setCallbackInfo(*args, **kwargs)
 
     def SetOwner(*args, **kwargs):
         return _misc_.Timer__setCallbackInfo(*args, **kwargs)
 
     def SetOwner(*args, **kwargs):
@@ -1131,8 +1325,10 @@ class Timer(_core.EvtHandler):
         """NO-OP: Timers must be destroyed by normal reference counting"""
         pass
 
         """NO-OP: Timers must be destroyed by normal reference counting"""
         pass
 
-Timer_swigregister = _misc_.Timer_swigregister
-Timer_swigregister(Timer)
+    Id = property(GetId,doc="See `GetId`") 
+    Interval = property(GetInterval,doc="See `GetInterval`") 
+    Owner = property(GetOwner,SetOwner,doc="See `GetOwner` and `SetOwner`") 
+_misc_.Timer_swigregister(Timer)
 
 # For backwards compatibility with 2.4
 class PyTimer(Timer):
 
 # For backwards compatibility with 2.4
 class PyTimer(Timer):
@@ -1159,8 +1355,8 @@ class TimerEvent(_core.Event):
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 
-TimerEvent_swigregister = _misc_.TimerEvent_swigregister
-TimerEvent_swigregister(TimerEvent)
+    Interval = property(GetInterval,doc="See `GetInterval`") 
+_misc_.TimerEvent_swigregister(TimerEvent)
 
 class TimerRunner(object):
     """Proxy of C++ TimerRunner class"""
 
 class TimerRunner(object):
     """Proxy of C++ TimerRunner class"""
@@ -1178,8 +1374,7 @@ class TimerRunner(object):
         """Start(self, int milli, bool oneShot=False)"""
         return _misc_.TimerRunner_Start(*args, **kwargs)
 
         """Start(self, int milli, bool oneShot=False)"""
         return _misc_.TimerRunner_Start(*args, **kwargs)
 
-TimerRunner_swigregister = _misc_.TimerRunner_swigregister
-TimerRunner_swigregister(TimerRunner)
+_misc_.TimerRunner_swigregister(TimerRunner)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
@@ -1224,7 +1419,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)
@@ -1263,7 +1458,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)
@@ -1272,8 +1467,18 @@ class Log(object):
         return _misc_.Log_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
         return _misc_.Log_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
+    def SetRepetitionCounting(*args, **kwargs):
+        """SetRepetitionCounting(bool bRepetCounting=True)"""
+        return _misc_.Log_SetRepetitionCounting(*args, **kwargs)
+
+    SetRepetitionCounting = staticmethod(SetRepetitionCounting)
+    def GetRepetitionCounting(*args, **kwargs):
+        """GetRepetitionCounting() -> bool"""
+        return _misc_.Log_GetRepetitionCounting(*args, **kwargs)
+
+    GetRepetitionCounting = staticmethod(GetRepetitionCounting)
     def SetTraceMask(*args, **kwargs):
     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)
@@ -1308,7 +1513,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)
@@ -1318,7 +1523,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)
@@ -1334,12 +1539,10 @@ class Log(object):
     TimeStamp = staticmethod(TimeStamp)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
     TimeStamp = staticmethod(TimeStamp)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _misc_.Log_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _misc_.Log_Destroy(*args, **kwargs)
 
 
-Log_swigregister = _misc_.Log_swigregister
-Log_swigregister(Log)
+_misc_.Log_swigregister(Log)
 
 def Log_IsEnabled(*args):
   """Log_IsEnabled() -> bool"""
 
 def Log_IsEnabled(*args):
   """Log_IsEnabled() -> bool"""
@@ -1350,7 +1553,7 @@ def Log_EnableLogging(*args, **kwargs):
   return _misc_.Log_EnableLogging(*args, **kwargs)
 
 def Log_OnLog(*args, **kwargs):
   return _misc_.Log_EnableLogging(*args, **kwargs)
 
 def Log_OnLog(*args, **kwargs):
-  """Log_OnLog(wxLogLevel level, wxChar szString, time_t t)"""
+  """Log_OnLog(LogLevel level, wxChar szString, time_t t)"""
   return _misc_.Log_OnLog(*args, **kwargs)
 
 def Log_FlushActive(*args):
   return _misc_.Log_OnLog(*args, **kwargs)
 
 def Log_FlushActive(*args):
@@ -1378,15 +1581,23 @@ def Log_SetVerbose(*args, **kwargs):
   return _misc_.Log_SetVerbose(*args, **kwargs)
 
 def Log_SetLogLevel(*args, **kwargs):
   return _misc_.Log_SetVerbose(*args, **kwargs)
 
 def Log_SetLogLevel(*args, **kwargs):
-  """Log_SetLogLevel(wxLogLevel logLevel)"""
+  """Log_SetLogLevel(LogLevel logLevel)"""
   return _misc_.Log_SetLogLevel(*args, **kwargs)
 
 def Log_DontCreateOnDemand(*args):
   """Log_DontCreateOnDemand()"""
   return _misc_.Log_DontCreateOnDemand(*args)
 
   return _misc_.Log_SetLogLevel(*args, **kwargs)
 
 def Log_DontCreateOnDemand(*args):
   """Log_DontCreateOnDemand()"""
   return _misc_.Log_DontCreateOnDemand(*args)
 
+def Log_SetRepetitionCounting(*args, **kwargs):
+  """Log_SetRepetitionCounting(bool bRepetCounting=True)"""
+  return _misc_.Log_SetRepetitionCounting(*args, **kwargs)
+
+def Log_GetRepetitionCounting(*args):
+  """Log_GetRepetitionCounting() -> bool"""
+  return _misc_.Log_GetRepetitionCounting(*args)
+
 def Log_SetTraceMask(*args, **kwargs):
 def Log_SetTraceMask(*args, **kwargs):
-  """Log_SetTraceMask(wxTraceMask ulMask)"""
+  """Log_SetTraceMask(TraceMask ulMask)"""
   return _misc_.Log_SetTraceMask(*args, **kwargs)
 
 def Log_AddTraceMask(*args, **kwargs):
   return _misc_.Log_SetTraceMask(*args, **kwargs)
 
 def Log_AddTraceMask(*args, **kwargs):
@@ -1414,7 +1625,7 @@ def Log_GetVerbose(*args):
   return _misc_.Log_GetVerbose(*args)
 
 def Log_GetTraceMask(*args):
   return _misc_.Log_GetVerbose(*args)
 
 def Log_GetTraceMask(*args):
-  """Log_GetTraceMask() -> wxTraceMask"""
+  """Log_GetTraceMask() -> TraceMask"""
   return _misc_.Log_GetTraceMask(*args)
 
 def Log_IsAllowedTraceMask(*args, **kwargs):
   return _misc_.Log_GetTraceMask(*args)
 
 def Log_IsAllowedTraceMask(*args, **kwargs):
@@ -1422,7 +1633,7 @@ def Log_IsAllowedTraceMask(*args, **kwargs):
   return _misc_.Log_IsAllowedTraceMask(*args, **kwargs)
 
 def Log_GetLogLevel(*args):
   return _misc_.Log_IsAllowedTraceMask(*args, **kwargs)
 
 def Log_GetLogLevel(*args):
-  """Log_GetLogLevel() -> wxLogLevel"""
+  """Log_GetLogLevel() -> LogLevel"""
   return _misc_.Log_GetLogLevel(*args)
 
 def Log_GetTimestamp(*args):
   return _misc_.Log_GetLogLevel(*args)
 
 def Log_GetTimestamp(*args):
@@ -1440,8 +1651,7 @@ class LogStderr(Log):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> LogStderr"""
         _misc_.LogStderr_swiginit(self,_misc_.new_LogStderr(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> LogStderr"""
         _misc_.LogStderr_swiginit(self,_misc_.new_LogStderr(*args, **kwargs))
-LogStderr_swigregister = _misc_.LogStderr_swigregister
-LogStderr_swigregister(LogStderr)
+_misc_.LogStderr_swigregister(LogStderr)
 
 class LogTextCtrl(Log):
     """Proxy of C++ LogTextCtrl class"""
 
 class LogTextCtrl(Log):
     """Proxy of C++ LogTextCtrl class"""
@@ -1450,8 +1660,7 @@ class LogTextCtrl(Log):
     def __init__(self, *args, **kwargs): 
         """__init__(self, wxTextCtrl pTextCtrl) -> LogTextCtrl"""
         _misc_.LogTextCtrl_swiginit(self,_misc_.new_LogTextCtrl(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, wxTextCtrl pTextCtrl) -> LogTextCtrl"""
         _misc_.LogTextCtrl_swiginit(self,_misc_.new_LogTextCtrl(*args, **kwargs))
-LogTextCtrl_swigregister = _misc_.LogTextCtrl_swigregister
-LogTextCtrl_swigregister(LogTextCtrl)
+_misc_.LogTextCtrl_swigregister(LogTextCtrl)
 
 class LogGui(Log):
     """Proxy of C++ LogGui class"""
 
 class LogGui(Log):
     """Proxy of C++ LogGui class"""
@@ -1460,8 +1669,7 @@ class LogGui(Log):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> LogGui"""
         _misc_.LogGui_swiginit(self,_misc_.new_LogGui(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> LogGui"""
         _misc_.LogGui_swiginit(self,_misc_.new_LogGui(*args, **kwargs))
-LogGui_swigregister = _misc_.LogGui_swigregister
-LogGui_swigregister(LogGui)
+_misc_.LogGui_swigregister(LogGui)
 
 class LogWindow(Log):
     """Proxy of C++ LogWindow class"""
 
 class LogWindow(Log):
     """Proxy of C++ LogWindow class"""
@@ -1490,8 +1698,9 @@ class LogWindow(Log):
         """PassMessages(self, bool bDoPass)"""
         return _misc_.LogWindow_PassMessages(*args, **kwargs)
 
         """PassMessages(self, bool bDoPass)"""
         return _misc_.LogWindow_PassMessages(*args, **kwargs)
 
-LogWindow_swigregister = _misc_.LogWindow_swigregister
-LogWindow_swigregister(LogWindow)
+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    OldLog = property(GetOldLog,doc="See `GetOldLog`") 
+_misc_.LogWindow_swigregister(LogWindow)
 
 class LogChain(Log):
     """Proxy of C++ LogChain class"""
 
 class LogChain(Log):
     """Proxy of C++ LogChain class"""
@@ -1516,8 +1725,8 @@ class LogChain(Log):
         """GetOldLog(self) -> Log"""
         return _misc_.LogChain_GetOldLog(*args, **kwargs)
 
         """GetOldLog(self) -> Log"""
         return _misc_.LogChain_GetOldLog(*args, **kwargs)
 
-LogChain_swigregister = _misc_.LogChain_swigregister
-LogChain_swigregister(LogChain)
+    OldLog = property(GetOldLog,doc="See `GetOldLog`") 
+_misc_.LogChain_swigregister(LogChain)
 
 class LogBuffer(Log):
     """Proxy of C++ LogBuffer class"""
 
 class LogBuffer(Log):
     """Proxy of C++ LogBuffer class"""
@@ -1530,8 +1739,8 @@ class LogBuffer(Log):
         """GetBuffer(self) -> String"""
         return _misc_.LogBuffer_GetBuffer(*args, **kwargs)
 
         """GetBuffer(self) -> String"""
         return _misc_.LogBuffer_GetBuffer(*args, **kwargs)
 
-LogBuffer_swigregister = _misc_.LogBuffer_swigregister
-LogBuffer_swigregister(LogBuffer)
+    Buffer = property(GetBuffer,doc="See `GetBuffer`") 
+_misc_.LogBuffer_swigregister(LogBuffer)
 
 
 def SysErrorCode(*args):
 
 
 def SysErrorCode(*args):
@@ -1598,8 +1807,7 @@ class LogNull(object):
         _misc_.LogNull_swiginit(self,_misc_.new_LogNull(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_LogNull
     __del__ = lambda self : None;
         _misc_.LogNull_swiginit(self,_misc_.new_LogNull(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_LogNull
     __del__ = lambda self : None;
-LogNull_swigregister = _misc_.LogNull_swigregister
-LogNull_swigregister(LogNull)
+_misc_.LogNull_swigregister(LogNull)
 
 def LogTrace(*args):
   """
 
 def LogTrace(*args):
   """
@@ -1615,14 +1823,13 @@ class PyLog(Log):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyLog"""
         _misc_.PyLog_swiginit(self,_misc_.new_PyLog(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> PyLog"""
         _misc_.PyLog_swiginit(self,_misc_.new_PyLog(*args, **kwargs))
-        self._setCallbackInfo(self, PyLog)
+        PyLog._setCallbackInfo(self, self, PyLog)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyLog__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyLog__setCallbackInfo(*args, **kwargs)
 
-PyLog_swigregister = _misc_.PyLog_swigregister
-PyLog_swigregister(PyLog)
+_misc_.PyLog_swigregister(PyLog)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
@@ -1674,12 +1881,22 @@ class Process(_core.EvtHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self, EvtHandler parent=None, int id=-1) -> Process"""
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, EvtHandler parent=None, int id=-1) -> Process"""
         _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
-        self._setCallbackInfo(self, Process)
+        Process._setCallbackInfo(self, self, Process); self.this.own(False)
 
 
+    __swig_destroy__ = _misc_.delete_Process
+    __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.Process__setCallbackInfo(*args, **kwargs)
 
+    def GetPid(*args, **kwargs):
+        """
+        GetPid(self) -> long
+
+        get the process ID of the process executed by Open()
+        """
+        return _misc_.Process_GetPid(*args, **kwargs)
+
     def OnTerminate(*args, **kwargs):
         """OnTerminate(self, int pid, int status)"""
         return _misc_.Process_OnTerminate(*args, **kwargs)
     def OnTerminate(*args, **kwargs):
         """OnTerminate(self, int pid, int status)"""
         return _misc_.Process_OnTerminate(*args, **kwargs)
@@ -1729,8 +1946,13 @@ class Process(_core.EvtHandler):
         """IsErrorAvailable(self) -> bool"""
         return _misc_.Process_IsErrorAvailable(*args, **kwargs)
 
         """IsErrorAvailable(self) -> bool"""
         return _misc_.Process_IsErrorAvailable(*args, **kwargs)
 
-Process_swigregister = _misc_.Process_swigregister
-Process_swigregister(Process)
+    ErrorStream = property(GetErrorStream,doc="See `GetErrorStream`") 
+    InputStream = property(GetInputStream,doc="See `GetInputStream`") 
+    OutputStream = property(GetOutputStream,doc="See `GetOutputStream`") 
+    InputOpened = property(IsInputOpened) 
+    InputAvailable = property(IsInputAvailable) 
+    ErrorAvailable = property(IsErrorAvailable) 
+_misc_.Process_swigregister(Process)
 
 def Process_Kill(*args, **kwargs):
   """Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
 
 def Process_Kill(*args, **kwargs):
   """Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int"""
@@ -1761,8 +1983,9 @@ 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)
-ProcessEvent_swigregister = _misc_.ProcessEvent_swigregister
-ProcessEvent_swigregister(ProcessEvent)
+    ExitCode = property(GetExitCode,doc="See `GetExitCode`") 
+    Pid = property(GetPid,doc="See `GetPid`") 
+_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 )
@@ -1967,8 +2190,38 @@ 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() 
-Joystick_swigregister = _misc_.Joystick_swigregister
-Joystick_swigregister(Joystick)
+    ButtonState = property(GetButtonState,doc="See `GetButtonState`") 
+    ManufacturerId = property(GetManufacturerId,doc="See `GetManufacturerId`") 
+    MaxAxes = property(GetMaxAxes,doc="See `GetMaxAxes`") 
+    MaxButtons = property(GetMaxButtons,doc="See `GetMaxButtons`") 
+    MovementThreshold = property(GetMovementThreshold,SetMovementThreshold,doc="See `GetMovementThreshold` and `SetMovementThreshold`") 
+    NumberAxes = property(GetNumberAxes,doc="See `GetNumberAxes`") 
+    NumberButtons = property(GetNumberButtons,doc="See `GetNumberButtons`") 
+    NumberJoysticks = property(GetNumberJoysticks,doc="See `GetNumberJoysticks`") 
+    POVCTSPosition = property(GetPOVCTSPosition,doc="See `GetPOVCTSPosition`") 
+    POVPosition = property(GetPOVPosition,doc="See `GetPOVPosition`") 
+    PollingMax = property(GetPollingMax,doc="See `GetPollingMax`") 
+    PollingMin = property(GetPollingMin,doc="See `GetPollingMin`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    ProductId = property(GetProductId,doc="See `GetProductId`") 
+    ProductName = property(GetProductName,doc="See `GetProductName`") 
+    RudderMax = property(GetRudderMax,doc="See `GetRudderMax`") 
+    RudderMin = property(GetRudderMin,doc="See `GetRudderMin`") 
+    RudderPosition = property(GetRudderPosition,doc="See `GetRudderPosition`") 
+    UMax = property(GetUMax,doc="See `GetUMax`") 
+    UMin = property(GetUMin,doc="See `GetUMin`") 
+    UPosition = property(GetUPosition,doc="See `GetUPosition`") 
+    VMax = property(GetVMax,doc="See `GetVMax`") 
+    VMin = property(GetVMin,doc="See `GetVMin`") 
+    VPosition = property(GetVPosition,doc="See `GetVPosition`") 
+    XMax = property(GetXMax,doc="See `GetXMax`") 
+    XMin = property(GetXMin,doc="See `GetXMin`") 
+    YMax = property(GetYMax,doc="See `GetYMax`") 
+    YMin = property(GetYMin,doc="See `GetYMin`") 
+    ZMax = property(GetZMax,doc="See `GetZMax`") 
+    ZMin = property(GetZMin,doc="See `GetZMin`") 
+    ZPosition = property(GetZPosition,doc="See `GetZPosition`") 
+_misc_.Joystick_swigregister(Joystick)
 
 wxEVT_JOY_BUTTON_DOWN = _misc_.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = _misc_.wxEVT_JOY_BUTTON_UP
 
 wxEVT_JOY_BUTTON_DOWN = _misc_.wxEVT_JOY_BUTTON_DOWN
 wxEVT_JOY_BUTTON_UP = _misc_.wxEVT_JOY_BUTTON_UP
@@ -1980,7 +2233,7 @@ class JoystickEvent(_core.Event):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 
+        __init__(self, EventType type=wxEVT_NULL, int state=0, int joystick=JOYSTICK1, 
             int change=0) -> JoystickEvent
         """
         _misc_.JoystickEvent_swiginit(self,_misc_.new_JoystickEvent(*args, **kwargs))
             int change=0) -> JoystickEvent
         """
         _misc_.JoystickEvent_swiginit(self,_misc_.new_JoystickEvent(*args, **kwargs))
@@ -2054,8 +2307,12 @@ class JoystickEvent(_core.Event):
     m_buttonState = property(GetButtonState, SetButtonState)
     m_joyStick = property(GetJoystick, SetJoystick)
 
     m_buttonState = property(GetButtonState, SetButtonState)
     m_joyStick = property(GetJoystick, SetJoystick)
 
-JoystickEvent_swigregister = _misc_.JoystickEvent_swigregister
-JoystickEvent_swigregister(JoystickEvent)
+    ButtonChange = property(GetButtonChange,SetButtonChange,doc="See `GetButtonChange` and `SetButtonChange`") 
+    ButtonState = property(GetButtonState,SetButtonState,doc="See `GetButtonState` and `SetButtonState`") 
+    Joystick = property(GetJoystick,SetJoystick,doc="See `GetJoystick` and `SetJoystick`") 
+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    ZPosition = property(GetZPosition,SetZPosition,doc="See `GetZPosition` and `SetZPosition`") 
+_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 )
@@ -2110,8 +2367,7 @@ class Sound(object):
 
     Stop = staticmethod(Stop)
     def __nonzero__(self): return self.IsOk() 
 
     Stop = staticmethod(Stop)
     def __nonzero__(self): return self.IsOk() 
-Sound_swigregister = _misc_.Sound_swigregister
-Sound_swigregister(Sound)
+_misc_.Sound_swigregister(Sound)
 
 def SoundFromData(*args, **kwargs):
     """SoundFromData(PyObject data) -> Sound"""
 
 def SoundFromData(*args, **kwargs):
     """SoundFromData(PyObject data) -> Sound"""
@@ -2188,8 +2444,16 @@ class FileTypeInfo(object):
         """GetIconIndex(self) -> int"""
         return _misc_.FileTypeInfo_GetIconIndex(*args, **kwargs)
 
         """GetIconIndex(self) -> int"""
         return _misc_.FileTypeInfo_GetIconIndex(*args, **kwargs)
 
-FileTypeInfo_swigregister = _misc_.FileTypeInfo_swigregister
-FileTypeInfo_swigregister(FileTypeInfo)
+    Description = property(GetDescription,doc="See `GetDescription`") 
+    Extensions = property(GetExtensions,doc="See `GetExtensions`") 
+    ExtensionsCount = property(GetExtensionsCount,doc="See `GetExtensionsCount`") 
+    IconFile = property(GetIconFile,doc="See `GetIconFile`") 
+    IconIndex = property(GetIconIndex,doc="See `GetIconIndex`") 
+    MimeType = property(GetMimeType,doc="See `GetMimeType`") 
+    OpenCommand = property(GetOpenCommand,doc="See `GetOpenCommand`") 
+    PrintCommand = property(GetPrintCommand,doc="See `GetPrintCommand`") 
+    ShortDesc = property(GetShortDesc,SetShortDesc,doc="See `GetShortDesc` and `SetShortDesc`") 
+_misc_.FileTypeInfo_swigregister(FileTypeInfo)
 
 def FileTypeInfoSequence(*args, **kwargs):
     """FileTypeInfoSequence(wxArrayString sArray) -> FileTypeInfo"""
 
 def FileTypeInfoSequence(*args, **kwargs):
     """FileTypeInfoSequence(wxArrayString sArray) -> FileTypeInfo"""
@@ -2263,8 +2527,16 @@ class FileType(object):
         return _misc_.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)
         return _misc_.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)
-FileType_swigregister = _misc_.FileType_swigregister
-FileType_swigregister(FileType)
+    AllCommands = property(GetAllCommands,doc="See `GetAllCommands`") 
+    Description = property(GetDescription,doc="See `GetDescription`") 
+    Extensions = property(GetExtensions,doc="See `GetExtensions`") 
+    Icon = property(GetIcon,doc="See `GetIcon`") 
+    IconInfo = property(GetIconInfo,doc="See `GetIconInfo`") 
+    MimeType = property(GetMimeType,doc="See `GetMimeType`") 
+    MimeTypes = property(GetMimeTypes,doc="See `GetMimeTypes`") 
+    OpenCommand = property(GetOpenCommand,doc="See `GetOpenCommand`") 
+    PrintCommand = property(GetPrintCommand,doc="See `GetPrintCommand`") 
+_misc_.FileType_swigregister(FileType)
 
 def FileType_ExpandCommand(*args, **kwargs):
   """FileType_ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""
 
 def FileType_ExpandCommand(*args, **kwargs):
   """FileType_ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""
@@ -2324,8 +2596,7 @@ class MimeTypesManager(object):
 
     __swig_destroy__ = _misc_.delete_MimeTypesManager
     __del__ = lambda self : None;
 
     __swig_destroy__ = _misc_.delete_MimeTypesManager
     __del__ = lambda self : None;
-MimeTypesManager_swigregister = _misc_.MimeTypesManager_swigregister
-MimeTypesManager_swigregister(MimeTypesManager)
+_misc_.MimeTypesManager_swigregister(MimeTypesManager)
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):
 TheMimeTypesManager = cvar.TheMimeTypesManager
 
 def MimeTypesManager_IsOfType(*args, **kwargs):
@@ -2343,7 +2614,7 @@ class ArtProvider(object):
     their own wx.ArtProvider class and easily replace standard art with
     his/her own version. It is easy thing to do: all that is needed is
     to derive a class from wx.ArtProvider, override it's CreateBitmap
     their own wx.ArtProvider class and easily replace standard art with
     his/her own version. It is easy thing to do: all that is needed is
     to derive a class from wx.ArtProvider, override it's CreateBitmap
-    method and register the provider with wx.ArtProvider.PushProvider::
+    method and register the provider with `wx.ArtProvider.Push`::
 
         class MyArtProvider(wx.ArtProvider):
             def __init__(self):
 
         class MyArtProvider(wx.ArtProvider):
             def __init__(self):
@@ -2367,7 +2638,7 @@ class ArtProvider(object):
         their own wx.ArtProvider class and easily replace standard art with
         his/her own version. It is easy thing to do: all that is needed is
         to derive a class from wx.ArtProvider, override it's CreateBitmap
         their own wx.ArtProvider class and easily replace standard art with
         his/her own version. It is easy thing to do: all that is needed is
         to derive a class from wx.ArtProvider, override it's CreateBitmap
-        method and register the provider with wx.ArtProvider.PushProvider::
+        method and register the provider with `wx.ArtProvider.Push`::
 
             class MyArtProvider(wx.ArtProvider):
                 def __init__(self):
 
             class MyArtProvider(wx.ArtProvider):
                 def __init__(self):
@@ -2379,7 +2650,7 @@ class ArtProvider(object):
 
         """
         _misc_.ArtProvider_swiginit(self,_misc_.new_ArtProvider(*args, **kwargs))
 
         """
         _misc_.ArtProvider_swiginit(self,_misc_.new_ArtProvider(*args, **kwargs))
-        self._setCallbackInfo(self, ArtProvider)
+        ArtProvider._setCallbackInfo(self, self, ArtProvider)
 
     __swig_destroy__ = _misc_.delete_ArtProvider
     __del__ = lambda self : None;
 
     __swig_destroy__ = _misc_.delete_ArtProvider
     __del__ = lambda self : None;
@@ -2387,36 +2658,49 @@ class ArtProvider(object):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
 
-    def PushProvider(*args, **kwargs):
+    def Push(*args, **kwargs):
         """
         """
-        PushProvider(ArtProvider provider)
+        Push(ArtProvider provider)
 
         Add new provider to the top of providers stack.
         """
 
         Add new provider to the top of providers stack.
         """
-        return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+        return _misc_.ArtProvider_Push(*args, **kwargs)
 
 
-    PushProvider = staticmethod(PushProvider)
-    def PopProvider(*args, **kwargs):
+    Push = staticmethod(Push)
+    PushProvider = Push 
+    def Insert(*args, **kwargs):
         """
         """
-        PopProvider() -> bool
+        Insert(ArtProvider provider)
+
+        Add new provider to the bottom of providers stack.
+        """
+        return _misc_.ArtProvider_Insert(*args, **kwargs)
+
+    Insert = staticmethod(Insert)
+    InsertProvider = Insert 
+    def Pop(*args, **kwargs):
+        """
+        Pop() -> bool
 
         Remove latest added provider and delete it.
         """
 
         Remove latest added provider and delete it.
         """
-        return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+        return _misc_.ArtProvider_Pop(*args, **kwargs)
 
 
-    PopProvider = staticmethod(PopProvider)
-    def RemoveProvider(*args, **kwargs):
+    Pop = staticmethod(Pop)
+    PopProvider = Pop 
+    def Delete(*args, **kwargs):
         """
         """
-        RemoveProvider(ArtProvider provider) -> bool
+        Delete(ArtProvider provider) -> bool
 
         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.
         """
-        val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+        val = _misc_.ArtProvider_Delete(*args, **kwargs)
         args[1].thisown = 1
         return val
 
         args[1].thisown = 1
         return val
 
-    RemoveProvider = staticmethod(RemoveProvider)
+    Delete = staticmethod(Delete)
+    RemoveProvider = Delete 
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
@@ -2449,12 +2733,10 @@ class ArtProvider(object):
     GetSizeHint = staticmethod(GetSizeHint)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
     GetSizeHint = staticmethod(GetSizeHint)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _misc_.ArtProvider_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _misc_.ArtProvider_Destroy(*args, **kwargs)
 
 
-ArtProvider_swigregister = _misc_.ArtProvider_swigregister
-ArtProvider_swigregister(ArtProvider)
+_misc_.ArtProvider_swigregister(ArtProvider)
 ART_TOOLBAR = cvar.ART_TOOLBAR
 ART_MENU = cvar.ART_MENU
 ART_FRAME_ICON = cvar.ART_FRAME_ICON
 ART_TOOLBAR = cvar.ART_TOOLBAR
 ART_MENU = cvar.ART_MENU
 ART_FRAME_ICON = cvar.ART_FRAME_ICON
@@ -2512,30 +2794,38 @@ ART_QUIT = cvar.ART_QUIT
 ART_FIND = cvar.ART_FIND
 ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
 
 ART_FIND = cvar.ART_FIND
 ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
 
-def ArtProvider_PushProvider(*args, **kwargs):
+def ArtProvider_Push(*args, **kwargs):
   """
   """
-    ArtProvider_PushProvider(ArtProvider provider)
+    ArtProvider_Push(ArtProvider provider)
 
     Add new provider to the top of providers stack.
     """
 
     Add new provider to the top of providers stack.
     """
-  return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+  return _misc_.ArtProvider_Push(*args, **kwargs)
 
 
-def ArtProvider_PopProvider(*args):
+def ArtProvider_Insert(*args, **kwargs):
   """
   """
-    ArtProvider_PopProvider() -> bool
+    ArtProvider_Insert(ArtProvider provider)
+
+    Add new provider to the bottom of providers stack.
+    """
+  return _misc_.ArtProvider_Insert(*args, **kwargs)
+
+def ArtProvider_Pop(*args):
+  """
+    ArtProvider_Pop() -> bool
 
     Remove latest added provider and delete it.
     """
 
     Remove latest added provider and delete it.
     """
-  return _misc_.ArtProvider_PopProvider(*args)
+  return _misc_.ArtProvider_Pop(*args)
 
 
-def ArtProvider_RemoveProvider(*args, **kwargs):
+def ArtProvider_Delete(*args, **kwargs):
   """
   """
-    ArtProvider_RemoveProvider(ArtProvider provider) -> bool
+    ArtProvider_Delete(ArtProvider provider) -> bool
 
     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.
     """
-  val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+  val = _misc_.ArtProvider_Delete(*args, **kwargs)
   args[1].thisown = 1
   return val
 
   args[1].thisown = 1
   return val
 
@@ -2937,8 +3227,18 @@ class ConfigBase(object):
         """GetStyle(self) -> long"""
         return _misc_.ConfigBase_GetStyle(*args, **kwargs)
 
         """GetStyle(self) -> long"""
         return _misc_.ConfigBase_GetStyle(*args, **kwargs)
 
-ConfigBase_swigregister = _misc_.ConfigBase_swigregister
-ConfigBase_swigregister(ConfigBase)
+    AppName = property(GetAppName,SetAppName,doc="See `GetAppName` and `SetAppName`") 
+    EntryType = property(GetEntryType,doc="See `GetEntryType`") 
+    FirstEntry = property(GetFirstEntry,doc="See `GetFirstEntry`") 
+    FirstGroup = property(GetFirstGroup,doc="See `GetFirstGroup`") 
+    NextEntry = property(GetNextEntry,doc="See `GetNextEntry`") 
+    NextGroup = property(GetNextGroup,doc="See `GetNextGroup`") 
+    NumberOfEntries = property(GetNumberOfEntries,doc="See `GetNumberOfEntries`") 
+    NumberOfGroups = property(GetNumberOfGroups,doc="See `GetNumberOfGroups`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    VendorName = property(GetVendorName,SetVendorName,doc="See `GetVendorName` and `SetVendorName`") 
+_misc_.ConfigBase_swigregister(ConfigBase)
 
 def ConfigBase_Set(*args, **kwargs):
   """
 
 def ConfigBase_Set(*args, **kwargs):
   """
@@ -2992,8 +3292,7 @@ class Config(ConfigBase):
         _misc_.Config_swiginit(self,_misc_.new_Config(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_Config
     __del__ = lambda self : None;
         _misc_.Config_swiginit(self,_misc_.new_Config(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_Config
     __del__ = lambda self : None;
-Config_swigregister = _misc_.Config_swigregister
-Config_swigregister(Config)
+_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."""
@@ -3008,8 +3307,7 @@ class FileConfig(ConfigBase):
         _misc_.FileConfig_swiginit(self,_misc_.new_FileConfig(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_FileConfig
     __del__ = lambda self : None;
         _misc_.FileConfig_swiginit(self,_misc_.new_FileConfig(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_FileConfig
     __del__ = lambda self : None;
-FileConfig_swigregister = _misc_.FileConfig_swigregister
-FileConfig_swigregister(FileConfig)
+_misc_.FileConfig_swigregister(FileConfig)
 
 class ConfigPathChanger(object):
     """
 
 class ConfigPathChanger(object):
     """
@@ -3033,8 +3331,7 @@ class ConfigPathChanger(object):
         """
         return _misc_.ConfigPathChanger_Name(*args, **kwargs)
 
         """
         return _misc_.ConfigPathChanger_Name(*args, **kwargs)
 
-ConfigPathChanger_swigregister = _misc_.ConfigPathChanger_swigregister
-ConfigPathChanger_swigregister(ConfigPathChanger)
+_misc_.ConfigPathChanger_swigregister(ConfigPathChanger)
 
 
 def ExpandEnvVars(*args, **kwargs):
 
 
 def ExpandEnvVars(*args, **kwargs):
@@ -3079,6 +3376,7 @@ class DateTime(object):
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12
     GMT10 = _misc_.DateTime_GMT10
     GMT11 = _misc_.DateTime_GMT11
     GMT12 = _misc_.DateTime_GMT12
+    GMT13 = _misc_.DateTime_GMT13
     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET
     WET = _misc_.DateTime_WET
     WEST = _misc_.DateTime_WEST
     CET = _misc_.DateTime_CET
@@ -3104,6 +3402,8 @@ class DateTime(object):
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST
     A_CST = _misc_.DateTime_A_CST
     A_EST = _misc_.DateTime_A_EST
     A_ESST = _misc_.DateTime_A_ESST
+    NZST = _misc_.DateTime_NZST
+    NZDT = _misc_.DateTime_NZDT
     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian
     UTC = _misc_.DateTime_UTC
     Gregorian = _misc_.DateTime_Gregorian
     Julian = _misc_.DateTime_Julian
@@ -3503,8 +3803,9 @@ class DateTime(object):
         """IsValid(self) -> bool"""
         return _misc_.DateTime_IsValid(*args, **kwargs)
 
         """IsValid(self) -> bool"""
         return _misc_.DateTime_IsValid(*args, **kwargs)
 
-    Ok = IsValid 
-    def __nonzero__(self): return self.Ok() 
+    IsOk = IsValid 
+    Ok = IsOk 
+    def __nonzero__(self): return self.IsOk() 
     def GetTicks(*args, **kwargs):
         """GetTicks(self) -> time_t"""
         return _misc_.DateTime_GetTicks(*args, **kwargs)
     def GetTicks(*args, **kwargs):
         """GetTicks(self) -> time_t"""
         return _misc_.DateTime_GetTicks(*args, **kwargs)
@@ -3714,8 +4015,31 @@ class DateTime(object):
         else:
             return "INVALID DateTime"
 
         else:
             return "INVALID DateTime"
 
-DateTime_swigregister = _misc_.DateTime_swigregister
-DateTime_swigregister(DateTime)
+    Day = property(GetDay,SetDay,doc="See `GetDay` and `SetDay`") 
+    DayOfYear = property(GetDayOfYear,doc="See `GetDayOfYear`") 
+    Hour = property(GetHour,SetHour,doc="See `GetHour` and `SetHour`") 
+    JDN = property(GetJDN,SetJDN,doc="See `GetJDN` and `SetJDN`") 
+    JulianDayNumber = property(GetJulianDayNumber,doc="See `GetJulianDayNumber`") 
+    LastMonthDay = property(GetLastMonthDay,doc="See `GetLastMonthDay`") 
+    LastWeekDay = property(GetLastWeekDay,doc="See `GetLastWeekDay`") 
+    MJD = property(GetMJD,doc="See `GetMJD`") 
+    Millisecond = property(GetMillisecond,SetMillisecond,doc="See `GetMillisecond` and `SetMillisecond`") 
+    Minute = property(GetMinute,SetMinute,doc="See `GetMinute` and `SetMinute`") 
+    ModifiedJulianDayNumber = property(GetModifiedJulianDayNumber,doc="See `GetModifiedJulianDayNumber`") 
+    Month = property(GetMonth,SetMonth,doc="See `GetMonth` and `SetMonth`") 
+    NextWeekDay = property(GetNextWeekDay,doc="See `GetNextWeekDay`") 
+    PrevWeekDay = property(GetPrevWeekDay,doc="See `GetPrevWeekDay`") 
+    RataDie = property(GetRataDie,doc="See `GetRataDie`") 
+    Second = property(GetSecond,SetSecond,doc="See `GetSecond` and `SetSecond`") 
+    Ticks = property(GetTicks,doc="See `GetTicks`") 
+    Week = property(GetWeek,doc="See `GetWeek`") 
+    WeekDay = property(GetWeekDay,doc="See `GetWeekDay`") 
+    WeekDayInSameWeek = property(GetWeekDayInSameWeek,doc="See `GetWeekDayInSameWeek`") 
+    WeekOfMonth = property(GetWeekOfMonth,doc="See `GetWeekOfMonth`") 
+    WeekOfYear = property(GetWeekOfYear,doc="See `GetWeekOfYear`") 
+    Year = property(GetYear,SetYear,doc="See `GetYear` and `SetYear`") 
+    YearDay = property(GetYearDay,doc="See `GetYearDay`") 
+_misc_.DateTime_swigregister(DateTime)
 DefaultDateTimeFormat = cvar.DefaultDateTimeFormat
 DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat
 
 DefaultDateTimeFormat = cvar.DefaultDateTimeFormat
 DefaultTimeSpanFormat = cvar.DefaultTimeSpanFormat
 
@@ -4034,8 +4358,13 @@ class TimeSpan(object):
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
-TimeSpan_swigregister = _misc_.TimeSpan_swigregister
-TimeSpan_swigregister(TimeSpan)
+    Days = property(GetDays,doc="See `GetDays`") 
+    Hours = property(GetHours,doc="See `GetHours`") 
+    Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
+    Minutes = property(GetMinutes,doc="See `GetMinutes`") 
+    Seconds = property(GetSeconds,doc="See `GetSeconds`") 
+    Weeks = property(GetWeeks,doc="See `GetWeeks`") 
+_misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):
   """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
 
 def TimeSpan_Milliseconds(*args, **kwargs):
   """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
@@ -4226,8 +4555,12 @@ 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)
 
-DateSpan_swigregister = _misc_.DateSpan_swigregister
-DateSpan_swigregister(DateSpan)
+    Days = property(GetDays,SetDays,doc="See `GetDays` and `SetDays`") 
+    Months = property(GetMonths,SetMonths,doc="See `GetMonths` and `SetMonths`") 
+    TotalDays = property(GetTotalDays,doc="See `GetTotalDays`") 
+    Weeks = property(GetWeeks,SetWeeks,doc="See `GetWeeks` and `SetWeeks`") 
+    Years = property(GetYears,SetYears,doc="See `GetYears` and `SetYears`") 
+_misc_.DateSpan_swigregister(DateSpan)
 
 def DateSpan_Days(*args, **kwargs):
   """DateSpan_Days(int days) -> DateSpan"""
 
 def DateSpan_Days(*args, **kwargs):
   """DateSpan_Days(int days) -> DateSpan"""
@@ -4368,8 +4701,9 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_SetId(*args, **kwargs)
 
         """
         return _misc_.DataFormat_SetId(*args, **kwargs)
 
-DataFormat_swigregister = _misc_.DataFormat_swigregister
-DataFormat_swigregister(DataFormat)
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Type = property(GetType,SetType,doc="See `GetType` and `SetType`") 
+_misc_.DataFormat_swigregister(DataFormat)
 DefaultDateTime = cvar.DefaultDateTime
 
 def CustomDataFormat(*args, **kwargs):
 DefaultDateTime = cvar.DefaultDateTime
 
 def CustomDataFormat(*args, **kwargs):
@@ -4466,8 +4800,12 @@ class DataObject(object):
         """
         return _misc_.DataObject_SetData(*args, **kwargs)
 
         """
         return _misc_.DataObject_SetData(*args, **kwargs)
 
-DataObject_swigregister = _misc_.DataObject_swigregister
-DataObject_swigregister(DataObject)
+    AllFormats = property(GetAllFormats,doc="See `GetAllFormats`") 
+    DataHere = property(GetDataHere,doc="See `GetDataHere`") 
+    DataSize = property(GetDataSize,doc="See `GetDataSize`") 
+    FormatCount = property(GetFormatCount,doc="See `GetFormatCount`") 
+    PreferredFormat = property(GetPreferredFormat,doc="See `GetPreferredFormat`") 
+_misc_.DataObject_swigregister(DataObject)
 FormatInvalid = cvar.FormatInvalid
 
 class DataObjectSimple(DataObject):
 FormatInvalid = cvar.FormatInvalid
 
 class DataObjectSimple(DataObject):
@@ -4535,8 +4873,8 @@ class DataObjectSimple(DataObject):
         """
         return _misc_.DataObjectSimple_SetData(*args, **kwargs)
 
         """
         return _misc_.DataObjectSimple_SetData(*args, **kwargs)
 
-DataObjectSimple_swigregister = _misc_.DataObjectSimple_swigregister
-DataObjectSimple_swigregister(DataObjectSimple)
+    Format = property(GetFormat,SetFormat,doc="See `GetFormat` and `SetFormat`") 
+_misc_.DataObjectSimple_swigregister(DataObjectSimple)
 
 class PyDataObjectSimple(DataObjectSimple):
     """
 
 class PyDataObjectSimple(DataObjectSimple):
     """
@@ -4561,14 +4899,13 @@ class PyDataObjectSimple(DataObjectSimple):
 
         """
         _misc_.PyDataObjectSimple_swiginit(self,_misc_.new_PyDataObjectSimple(*args, **kwargs))
 
         """
         _misc_.PyDataObjectSimple_swiginit(self,_misc_.new_PyDataObjectSimple(*args, **kwargs))
-        self._setCallbackInfo(self, PyDataObjectSimple)
+        PyDataObjectSimple._setCallbackInfo(self, self, PyDataObjectSimple)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyDataObjectSimple__setCallbackInfo(*args, **kwargs)
 
-PyDataObjectSimple_swigregister = _misc_.PyDataObjectSimple_swigregister
-PyDataObjectSimple_swigregister(PyDataObjectSimple)
+_misc_.PyDataObjectSimple_swigregister(PyDataObjectSimple)
 
 class DataObjectComposite(DataObject):
     """
 
 class DataObjectComposite(DataObject):
     """
@@ -4625,8 +4962,8 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
 
         """
         return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
 
-DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
-DataObjectComposite_swigregister(DataObjectComposite)
+    ReceivedFormat = property(GetReceivedFormat,doc="See `GetReceivedFormat`") 
+_misc_.DataObjectComposite_swigregister(DataObjectComposite)
 
 class TextDataObject(DataObjectSimple):
     """
 
 class TextDataObject(DataObjectSimple):
     """
@@ -4684,8 +5021,9 @@ class TextDataObject(DataObjectSimple):
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 
-TextDataObject_swigregister = _misc_.TextDataObject_swigregister
-TextDataObject_swigregister(TextDataObject)
+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextLength = property(GetTextLength,doc="See `GetTextLength`") 
+_misc_.TextDataObject_swigregister(TextDataObject)
 
 class PyTextDataObject(TextDataObject):
     """
 
 class PyTextDataObject(TextDataObject):
     """
@@ -4710,14 +5048,13 @@ class PyTextDataObject(TextDataObject):
         into the data object.
         """
         _misc_.PyTextDataObject_swiginit(self,_misc_.new_PyTextDataObject(*args, **kwargs))
         into the data object.
         """
         _misc_.PyTextDataObject_swiginit(self,_misc_.new_PyTextDataObject(*args, **kwargs))
-        self._setCallbackInfo(self, PyTextDataObject)
+        PyTextDataObject._setCallbackInfo(self, self, PyTextDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTextDataObject__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyTextDataObject__setCallbackInfo(*args, **kwargs)
 
-PyTextDataObject_swigregister = _misc_.PyTextDataObject_swigregister
-PyTextDataObject_swigregister(PyTextDataObject)
+_misc_.PyTextDataObject_swigregister(PyTextDataObject)
 
 class BitmapDataObject(DataObjectSimple):
     """
 
 class BitmapDataObject(DataObjectSimple):
     """
@@ -4758,8 +5095,8 @@ class BitmapDataObject(DataObjectSimple):
         """
         return _misc_.BitmapDataObject_SetBitmap(*args, **kwargs)
 
         """
         return _misc_.BitmapDataObject_SetBitmap(*args, **kwargs)
 
-BitmapDataObject_swigregister = _misc_.BitmapDataObject_swigregister
-BitmapDataObject_swigregister(BitmapDataObject)
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
+_misc_.BitmapDataObject_swigregister(BitmapDataObject)
 
 class PyBitmapDataObject(BitmapDataObject):
     """
 
 class PyBitmapDataObject(BitmapDataObject):
     """
@@ -4780,14 +5117,13 @@ class PyBitmapDataObject(BitmapDataObject):
         data on demand derive from this class and overload `GetBitmap`.
         """
         _misc_.PyBitmapDataObject_swiginit(self,_misc_.new_PyBitmapDataObject(*args, **kwargs))
         data on demand derive from this class and overload `GetBitmap`.
         """
         _misc_.PyBitmapDataObject_swiginit(self,_misc_.new_PyBitmapDataObject(*args, **kwargs))
-        self._setCallbackInfo(self, PyBitmapDataObject)
+        PyBitmapDataObject._setCallbackInfo(self, self, PyBitmapDataObject)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
 
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.PyBitmapDataObject__setCallbackInfo(*args, **kwargs)
 
-PyBitmapDataObject_swigregister = _misc_.PyBitmapDataObject_swigregister
-PyBitmapDataObject_swigregister(PyBitmapDataObject)
+_misc_.PyBitmapDataObject_swigregister(PyBitmapDataObject)
 
 class FileDataObject(DataObjectSimple):
     """
 
 class FileDataObject(DataObjectSimple):
     """
@@ -4819,8 +5155,8 @@ class FileDataObject(DataObjectSimple):
         """
         return _misc_.FileDataObject_AddFile(*args, **kwargs)
 
         """
         return _misc_.FileDataObject_AddFile(*args, **kwargs)
 
-FileDataObject_swigregister = _misc_.FileDataObject_swigregister
-FileDataObject_swigregister(FileDataObject)
+    Filenames = property(GetFilenames,doc="See `GetFilenames`") 
+_misc_.FileDataObject_swigregister(FileDataObject)
 
 class CustomDataObject(DataObjectSimple):
     """
 
 class CustomDataObject(DataObjectSimple):
     """
@@ -4870,8 +5206,9 @@ class CustomDataObject(DataObjectSimple):
         """
         return _misc_.CustomDataObject_GetData(*args, **kwargs)
 
         """
         return _misc_.CustomDataObject_GetData(*args, **kwargs)
 
-CustomDataObject_swigregister = _misc_.CustomDataObject_swigregister
-CustomDataObject_swigregister(CustomDataObject)
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+    Size = property(GetSize,doc="See `GetSize`") 
+_misc_.CustomDataObject_swigregister(CustomDataObject)
 
 class URLDataObject(DataObject):
     """
 
 class URLDataObject(DataObject):
     """
@@ -4882,7 +5219,7 @@ class URLDataObject(DataObject):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self) -> URLDataObject
+        __init__(self, String url=EmptyString) -> 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.
 
         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.
@@ -4904,8 +5241,8 @@ class URLDataObject(DataObject):
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 
-URLDataObject_swigregister = _misc_.URLDataObject_swigregister
-URLDataObject_swigregister(URLDataObject)
+    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
+_misc_.URLDataObject_swigregister(URLDataObject)
 
 class MetafileDataObject(DataObjectSimple):
     """Proxy of C++ MetafileDataObject class"""
 
 class MetafileDataObject(DataObjectSimple):
     """Proxy of C++ MetafileDataObject class"""
@@ -4922,8 +5259,7 @@ class MetafileDataObject(DataObjectSimple):
         """GetMetafile(self) -> wxMetafile"""
         return _misc_.MetafileDataObject_GetMetafile(*args, **kwargs)
 
         """GetMetafile(self) -> wxMetafile"""
         return _misc_.MetafileDataObject_GetMetafile(*args, **kwargs)
 
-MetafileDataObject_swigregister = _misc_.MetafileDataObject_swigregister
-MetafileDataObject_swigregister(MetafileDataObject)
+_misc_.MetafileDataObject_swigregister(MetafileDataObject)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
@@ -4950,10 +5286,10 @@ class DropSource(object):
             Cursor none=wxNullCursor) -> DropSource
         """
         _misc_.DropSource_swiginit(self,_misc_.new_DropSource(*args, **kwargs))
             Cursor none=wxNullCursor) -> DropSource
         """
         _misc_.DropSource_swiginit(self,_misc_.new_DropSource(*args, **kwargs))
-        self._setCallbackInfo(self, DropSource, 0)
+        DropSource._setCallbackInfo(self, self, DropSource)
 
     def _setCallbackInfo(*args, **kwargs):
 
     def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
         return _misc_.DropSource__setCallbackInfo(*args, **kwargs)
 
     __swig_destroy__ = _misc_.delete_DropSource
         return _misc_.DropSource__setCallbackInfo(*args, **kwargs)
 
     __swig_destroy__ = _misc_.delete_DropSource
@@ -4983,8 +5319,8 @@ class DropSource(object):
     base_GiveFeedback = wx._deprecated(base_GiveFeedback,
                                    "Please use DropSource.GiveFeedback instead.")
 
     base_GiveFeedback = wx._deprecated(base_GiveFeedback,
                                    "Please use DropSource.GiveFeedback instead.")
 
-DropSource_swigregister = _misc_.DropSource_swigregister
-DropSource_swigregister(DropSource)
+    DataObject = property(GetDataObject,SetData,doc="See `GetDataObject` and `SetData`") 
+_misc_.DropSource_swigregister(DropSource)
 
 def DROP_ICON(filename):
     """
 
 def DROP_ICON(filename):
     """
@@ -5005,7 +5341,7 @@ class DropTarget(object):
     def __init__(self, *args, **kwargs): 
         """__init__(self, DataObject dataObject=None) -> DropTarget"""
         _misc_.DropTarget_swiginit(self,_misc_.new_DropTarget(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self, DataObject dataObject=None) -> DropTarget"""
         _misc_.DropTarget_swiginit(self,_misc_.new_DropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, DropTarget)
+        DropTarget._setCallbackInfo(self, self, DropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5069,8 +5405,9 @@ class DropTarget(object):
         """GetDefaultAction(self) -> int"""
         return _misc_.DropTarget_GetDefaultAction(*args, **kwargs)
 
         """GetDefaultAction(self) -> int"""
         return _misc_.DropTarget_GetDefaultAction(*args, **kwargs)
 
-DropTarget_swigregister = _misc_.DropTarget_swigregister
-DropTarget_swigregister(DropTarget)
+    DataObject = property(GetDataObject,SetDataObject,doc="See `GetDataObject` and `SetDataObject`") 
+    DefaultAction = property(GetDefaultAction,SetDefaultAction,doc="See `GetDefaultAction` and `SetDefaultAction`") 
+_misc_.DropTarget_swigregister(DropTarget)
 
 PyDropTarget = DropTarget 
 class TextDropTarget(DropTarget):
 
 PyDropTarget = DropTarget 
 class TextDropTarget(DropTarget):
@@ -5080,7 +5417,7 @@ class TextDropTarget(DropTarget):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> TextDropTarget"""
         _misc_.TextDropTarget_swiginit(self,_misc_.new_TextDropTarget(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> TextDropTarget"""
         _misc_.TextDropTarget_swiginit(self,_misc_.new_TextDropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, TextDropTarget)
+        TextDropTarget._setCallbackInfo(self, self, TextDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5140,8 +5477,7 @@ class TextDropTarget(DropTarget):
     base_OnData = wx._deprecated(base_OnData,
                                    "Please use TextDropTarget.OnData instead.")
 
     base_OnData = wx._deprecated(base_OnData,
                                    "Please use TextDropTarget.OnData instead.")
 
-TextDropTarget_swigregister = _misc_.TextDropTarget_swigregister
-TextDropTarget_swigregister(TextDropTarget)
+_misc_.TextDropTarget_swigregister(TextDropTarget)
 
 class FileDropTarget(DropTarget):
     """Proxy of C++ FileDropTarget class"""
 
 class FileDropTarget(DropTarget):
     """Proxy of C++ FileDropTarget class"""
@@ -5150,7 +5486,7 @@ class FileDropTarget(DropTarget):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> FileDropTarget"""
         _misc_.FileDropTarget_swiginit(self,_misc_.new_FileDropTarget(*args, **kwargs))
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> FileDropTarget"""
         _misc_.FileDropTarget_swiginit(self,_misc_.new_FileDropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, FileDropTarget)
+        FileDropTarget._setCallbackInfo(self, self, FileDropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5210,8 +5546,7 @@ class FileDropTarget(DropTarget):
     base_OnData = wx._deprecated(base_OnData,
                                    "Please use FileDropTarget.OnData instead.")
 
     base_OnData = wx._deprecated(base_OnData,
                                    "Please use FileDropTarget.OnData instead.")
 
-FileDropTarget_swigregister = _misc_.FileDropTarget_swigregister
-FileDropTarget_swigregister(FileDropTarget)
+_misc_.FileDropTarget_swigregister(FileDropTarget)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
@@ -5347,8 +5682,8 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
-Clipboard_swigregister = _misc_.Clipboard_swigregister
-Clipboard_swigregister(Clipboard)
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+_misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):
   """
 
 def Clipboard_Get(*args):
   """
@@ -5402,8 +5737,7 @@ class ClipboardLocker(object):
         """
         return _misc_.ClipboardLocker___nonzero__(*args, **kwargs)
 
         """
         return _misc_.ClipboardLocker___nonzero__(*args, **kwargs)
 
-ClipboardLocker_swigregister = _misc_.ClipboardLocker_swigregister
-ClipboardLocker_swigregister(ClipboardLocker)
+_misc_.ClipboardLocker_swigregister(ClipboardLocker)
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
@@ -5476,8 +5810,10 @@ 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)
-VideoMode_swigregister = _misc_.VideoMode_swigregister
-VideoMode_swigregister(VideoMode)
+    Depth = property(GetDepth,doc="See `GetDepth`") 
+    Height = property(GetHeight,doc="See `GetHeight`") 
+    Width = property(GetWidth,doc="See `GetWidth`") 
+_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"""
@@ -5485,7 +5821,7 @@ class Display(object):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, size_t index=0) -> Display
+        __init__(self, unsigned int index=0) -> Display
 
         Set up a Display instance with the specified display.  The displays
         are numbered from 0 to GetCount() - 1, 0 is always the primary display
 
         Set up a Display instance with the specified display.  The displays
         are numbered from 0 to GetCount() - 1, 0 is always the primary display
@@ -5496,7 +5832,7 @@ class Display(object):
     __del__ = lambda self : None;
     def GetCount(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def GetCount(*args, **kwargs):
         """
-        GetCount() -> size_t
+        GetCount() -> unsigned int
 
         Return the number of available displays.
         """
 
         Return the number of available displays.
         """
@@ -5620,13 +5956,17 @@ class Display(object):
         """
         return _misc_.Display_ResetMode(*args, **kwargs)
 
         """
         return _misc_.Display_ResetMode(*args, **kwargs)
 
-Display_swigregister = _misc_.Display_swigregister
-Display_swigregister(Display)
+    ClientArea = property(GetClientArea,doc="See `GetClientArea`") 
+    CurrentMode = property(GetCurrentMode,doc="See `GetCurrentMode`") 
+    Geometry = property(GetGeometry,doc="See `GetGeometry`") 
+    Modes = property(GetModes,doc="See `GetModes`") 
+    Name = property(GetName,doc="See `GetName`") 
+_misc_.Display_swigregister(Display)
 DefaultVideoMode = cvar.DefaultVideoMode
 
 def Display_GetCount(*args):
   """
 DefaultVideoMode = cvar.DefaultVideoMode
 
 def Display_GetCount(*args):
   """
-    Display_GetCount() -> size_t
+    Display_GetCount() -> unsigned int
 
     Return the number of available displays.
     """
 
     Return the number of available displays.
     """
@@ -5694,6 +6034,16 @@ class StandardPaths(object):
         return _misc_.StandardPaths_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
         return _misc_.StandardPaths_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
+    def GetExecutablePath(*args, **kwargs):
+        """
+        GetExecutablePath(self) -> String
+
+        Return the path (directory+filename) of the running executable or an
+        empty string if it couldn't be determined.  The path is returned as an
+        absolute path whenever possible.
+        """
+        return _misc_.StandardPaths_GetExecutablePath(*args, **kwargs)
+
     def GetConfigDir(*args, **kwargs):
         """
         GetConfigDir(self) -> String
     def GetConfigDir(*args, **kwargs):
         """
         GetConfigDir(self) -> String
@@ -5797,6 +6147,25 @@ class StandardPaths(object):
         """
         return _misc_.StandardPaths_GetLocalizedResourcesDir(*args, **kwargs)
 
         """
         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 GetTempDir(*args, **kwargs):
+        """
+        GetTempDir(self) -> String
+
+        Return the user's directory for temporary files.
+        """
+        return _misc_.StandardPaths_GetTempDir(*args, **kwargs)
+
     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)
     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)
@@ -5817,8 +6186,7 @@ class StandardPaths(object):
         """
         return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs)
 
         """
         return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs)
 
-StandardPaths_swigregister = _misc_.StandardPaths_swigregister
-StandardPaths_swigregister(StandardPaths)
+_misc_.StandardPaths_swigregister(StandardPaths)
 
 def StandardPaths_Get(*args):
   """
 
 def StandardPaths_Get(*args):
   """
@@ -5828,5 +6196,473 @@ def StandardPaths_Get(*args):
     """
   return _misc_.StandardPaths_Get(*args)
 
     """
   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)
+#---------------------------------------------------------------------------
+
+class AboutDialogInfo(object):
+    """
+    `wx.AboutDialogInfo` contains information to be shown in the standard
+    About dialog displayed by the `wx.AboutBox` function.  This class
+    contains the general information about the program, such as its name,
+    version, copyright and so on, as well as lists of the program
+    developers, documentation writers, artists and translators.
+
+    While all the main platforms have a native implementation of the about
+    dialog, they are often more limited than the generic version provided
+    by wxWidgets and so the generic version is used if
+    `wx.AboutDialogInfo` has any fields not supported by the native
+    version. Currently GTK+ version supports all the possible fields
+    natively but MSW and Mac versions don't support URLs, licence text nor
+    custom icons in the about dialog and if either of those is used,
+    wxAboutBox() will automatically use the generic version so you should
+    avoid specifying these fields to achieve more native look and feel.
+
+    """
+    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) -> AboutDialogInfo
+
+        `wx.AboutDialogInfo` contains information to be shown in the standard
+        About dialog displayed by the `wx.AboutBox` function.  This class
+        contains the general information about the program, such as its name,
+        version, copyright and so on, as well as lists of the program
+        developers, documentation writers, artists and translators.
+
+        While all the main platforms have a native implementation of the about
+        dialog, they are often more limited than the generic version provided
+        by wxWidgets and so the generic version is used if
+        `wx.AboutDialogInfo` has any fields not supported by the native
+        version. Currently GTK+ version supports all the possible fields
+        natively but MSW and Mac versions don't support URLs, licence text nor
+        custom icons in the about dialog and if either of those is used,
+        wxAboutBox() will automatically use the generic version so you should
+        avoid specifying these fields to achieve more native look and feel.
+
+        """
+        _misc_.AboutDialogInfo_swiginit(self,_misc_.new_AboutDialogInfo(*args, **kwargs))
+    __swig_destroy__ = _misc_.delete_AboutDialogInfo
+    __del__ = lambda self : None;
+    def SetName(*args, **kwargs):
+        """
+        SetName(self, String name)
+
+        Set the name of the program. If this method is not called, the string
+        returned by `wx.App.GetAppName` will be shown in the dialog.
+        """
+        return _misc_.AboutDialogInfo_SetName(*args, **kwargs)
+
+    def GetName(*args, **kwargs):
+        """
+        GetName(self) -> String
+
+        Returns the program name.
+        """
+        return _misc_.AboutDialogInfo_GetName(*args, **kwargs)
+
+    Name = property(GetName,SetName) 
+    def SetVersion(*args, **kwargs):
+        """
+        SetVersion(self, String version)
+
+        Set the version of the program. The version is in free format,
+        i.e. not necessarily in the x.y.z form but it shouldn't contain the
+        "version" word.
+        """
+        return _misc_.AboutDialogInfo_SetVersion(*args, **kwargs)
+
+    def HasVersion(*args, **kwargs):
+        """
+        HasVersion(self) -> bool
+
+        Returns ``True`` if the version property has been set.
+        """
+        return _misc_.AboutDialogInfo_HasVersion(*args, **kwargs)
+
+    def GetVersion(*args, **kwargs):
+        """
+        GetVersion(self) -> String
+
+        Returns the version value.
+        """
+        return _misc_.AboutDialogInfo_GetVersion(*args, **kwargs)
+
+    Version = property(GetVersion,SetVersion) 
+    def SetDescription(*args, **kwargs):
+        """
+        SetDescription(self, String desc)
+
+        Set brief, but possibly multiline, description of the program.
+        """
+        return _misc_.AboutDialogInfo_SetDescription(*args, **kwargs)
+
+    def HasDescription(*args, **kwargs):
+        """
+        HasDescription(self) -> bool
+
+        Returns ``True`` if the description property has been set.
+        """
+        return _misc_.AboutDialogInfo_HasDescription(*args, **kwargs)
+
+    def GetDescription(*args, **kwargs):
+        """
+        GetDescription(self) -> String
+
+        Returns the description value.
+        """
+        return _misc_.AboutDialogInfo_GetDescription(*args, **kwargs)
+
+    Description = property(GetDescription,SetDescription) 
+    def SetCopyright(*args, **kwargs):
+        """
+        SetCopyright(self, String copyright)
+
+        Set the short string containing the program copyright
+        information. Notice that any occurrences of "(C)" in ``copyright``
+        will be replaced by the copyright symbol (circled C) automatically,
+        which means that you can avoid using this symbol in the program source
+        code which can be problematic.
+        """
+        return _misc_.AboutDialogInfo_SetCopyright(*args, **kwargs)
+
+    def HasCopyright(*args, **kwargs):
+        """
+        HasCopyright(self) -> bool
+
+        Returns ``True`` if the copyright property has been set.
+        """
+        return _misc_.AboutDialogInfo_HasCopyright(*args, **kwargs)
+
+    def GetCopyright(*args, **kwargs):
+        """
+        GetCopyright(self) -> String
+
+        Returns the copyright value.
+        """
+        return _misc_.AboutDialogInfo_GetCopyright(*args, **kwargs)
+
+    Copyright = property(GetCopyright,SetCopyright) 
+    def SetLicence(*args, **kwargs):
+        """
+        SetLicence(self, String licence)
+
+        Set the long, multiline string containing the text of the program
+        licence.
+
+        Only GTK+ version supports showing the licence text in the native
+        about dialog currently so the generic version will be used under all
+        the other platforms if this method is called. To preserve the native
+        look and feel it is advised that you do not call this method but
+        provide a separate menu item in the "Help" menu for displaying the
+        text of your program licence.
+
+        """
+        return _misc_.AboutDialogInfo_SetLicence(*args, **kwargs)
+
+    def SetLicense(*args, **kwargs):
+        """
+        SetLicense(self, String licence)
+
+        This is the same as `SetLicence`.
+        """
+        return _misc_.AboutDialogInfo_SetLicense(*args, **kwargs)
+
+    def HasLicence(*args, **kwargs):
+        """
+        HasLicence(self) -> bool
+
+        Returns ``True`` if the licence property has been set.
+        """
+        return _misc_.AboutDialogInfo_HasLicence(*args, **kwargs)
+
+    def GetLicence(*args, **kwargs):
+        """
+        GetLicence(self) -> String
+
+        Returns the licence value.
+        """
+        return _misc_.AboutDialogInfo_GetLicence(*args, **kwargs)
+
+    Licence = property(GetLicence,SetLicence) 
+    License = Licence 
+    def SetIcon(*args, **kwargs):
+        """
+        SetIcon(self, Icon icon)
+
+        Set the icon to be shown in the dialog. By default the icon of the
+        main frame will be shown if the native about dialog supports custom
+        icons. If it doesn't but a valid icon is specified using this method,
+        the generic about dialog is used instead so you should avoid calling
+        this function for maximally native look and feel.
+        """
+        return _misc_.AboutDialogInfo_SetIcon(*args, **kwargs)
+
+    def HasIcon(*args, **kwargs):
+        """
+        HasIcon(self) -> bool
+
+        Returns ``True`` if the icon property has been set.
+        """
+        return _misc_.AboutDialogInfo_HasIcon(*args, **kwargs)
+
+    def GetIcon(*args, **kwargs):
+        """
+        GetIcon(self) -> Icon
+
+        Return the current icon value.
+        """
+        return _misc_.AboutDialogInfo_GetIcon(*args, **kwargs)
+
+    Icon = property(GetIcon,SetIcon) 
+    def _SetWebSite(*args, **kwargs):
+        """_SetWebSite(self, String url, String desc=wxEmptyString)"""
+        return _misc_.AboutDialogInfo__SetWebSite(*args, **kwargs)
+
+    def _GetWebSiteURL(*args, **kwargs):
+        """_GetWebSiteURL(self) -> String"""
+        return _misc_.AboutDialogInfo__GetWebSiteURL(*args, **kwargs)
+
+    def _GetWebSiteDescription(*args, **kwargs):
+        """_GetWebSiteDescription(self) -> String"""
+        return _misc_.AboutDialogInfo__GetWebSiteDescription(*args, **kwargs)
+
+    def HasWebSite(*args, **kwargs):
+        """HasWebSite(self) -> bool"""
+        return _misc_.AboutDialogInfo_HasWebSite(*args, **kwargs)
+
+    def SetWebSite(self, args):
+        """
+        SetWebSite(self, URL, [Description])
+
+        Set the web site property.  The ``args`` parameter can
+        either be a single string for the URL, to a 2-tuple of
+        (URL, Description) strings.
+        """
+        if type(args) in [str, unicode]:
+            self._SetWebSite(args)
+        else:
+            self._SetWebSite(args[0], args[1])
+                
+    def GetWebSite(self):
+        """
+        GetWebSite(self) --> (URL, Description)
+        """
+        return (self._GetWebSiteURL(), self._GetWebSiteDescription())
+
+    WebSite = property(GetWebSite,SetWebSite) 
+    def SetDevelopers(*args, **kwargs):
+        """
+        SetDevelopers(self, list developers)
+
+        Set the list of the developers of the program.
+        """
+        return _misc_.AboutDialogInfo_SetDevelopers(*args, **kwargs)
+
+    def AddDeveloper(*args, **kwargs):
+        """
+        AddDeveloper(self, String developer)
+
+        Add a string to the list of developers.
+        """
+        return _misc_.AboutDialogInfo_AddDeveloper(*args, **kwargs)
+
+    def HasDevelopers(*args, **kwargs):
+        """
+        HasDevelopers(self) -> bool
+
+        Returns ``True if any developers have been set.
+        """
+        return _misc_.AboutDialogInfo_HasDevelopers(*args, **kwargs)
+
+    def GetDevelopers(*args, **kwargs):
+        """
+        GetDevelopers(self) --> list
+
+        Returns the list of developers.
+        """
+        return _misc_.AboutDialogInfo_GetDevelopers(*args, **kwargs)
+
+    Developers = property(GetDevelopers,SetDevelopers) 
+    def SetDocWriters(*args, **kwargs):
+        """
+        SetDocWriters(self, list docwriters)
+
+        Set the list of the documentation writers.
+        """
+        return _misc_.AboutDialogInfo_SetDocWriters(*args, **kwargs)
+
+    def AddDocWriter(*args, **kwargs):
+        """
+        AddDocWriter(self, String docwriter)
+
+        Add a string to the list of documentation writers.
+        """
+        return _misc_.AboutDialogInfo_AddDocWriter(*args, **kwargs)
+
+    def HasDocWriters(*args, **kwargs):
+        """
+        HasDocWriters(self) -> bool
+
+        Returns ``True if any documentation writers have been set.
+        """
+        return _misc_.AboutDialogInfo_HasDocWriters(*args, **kwargs)
+
+    def GetDocWriters(*args, **kwargs):
+        """
+        GetDocWriters(self) --> list
+
+        Returns the list of documentation writers.
+        """
+        return _misc_.AboutDialogInfo_GetDocWriters(*args, **kwargs)
+
+    DocWriters = property(GetDocWriters,SetDocWriters) 
+    def SetArtists(*args, **kwargs):
+        """
+        SetArtists(self, list artists)
+
+        Set the list of artists for the program.
+        """
+        return _misc_.AboutDialogInfo_SetArtists(*args, **kwargs)
+
+    def AddArtist(*args, **kwargs):
+        """
+        AddArtist(self, String artist)
+
+        Add a string to the list of artists.
+        """
+        return _misc_.AboutDialogInfo_AddArtist(*args, **kwargs)
+
+    def HasArtists(*args, **kwargs):
+        """
+        HasArtists(self) -> bool
+
+        Returns ``True`` if any artists have been set.
+        """
+        return _misc_.AboutDialogInfo_HasArtists(*args, **kwargs)
+
+    def GetArtists(*args, **kwargs):
+        """
+        GetArtists(self) --> list
+
+        Returns the list od artists.
+        """
+        return _misc_.AboutDialogInfo_GetArtists(*args, **kwargs)
+
+    Artists = property(GetArtists,SetArtists) 
+    def SetTranslators(*args, **kwargs):
+        """
+        SetTranslators(self, list translators)
+
+        Sets the list of program translators.
+        """
+        return _misc_.AboutDialogInfo_SetTranslators(*args, **kwargs)
+
+    def AddTranslator(*args, **kwargs):
+        """
+        AddTranslator(self, String translator)
+
+        Add a string to the list of translators.
+        """
+        return _misc_.AboutDialogInfo_AddTranslator(*args, **kwargs)
+
+    def HasTranslators(*args, **kwargs):
+        """
+        HasTranslators(self) -> bool
+
+        Returns ``True`` if any translators have been set.
+        """
+        return _misc_.AboutDialogInfo_HasTranslators(*args, **kwargs)
+
+    def GetTranslators(*args, **kwargs):
+        """
+        GetTranslators(self) --> list
+
+        Returns the list of program translators.
+        """
+        return _misc_.AboutDialogInfo_GetTranslators(*args, **kwargs)
+
+    Translators = property(GetTranslators,SetTranslators) 
+    def IsSimple(*args, **kwargs):
+        """IsSimple(self) -> bool"""
+        return _misc_.AboutDialogInfo_IsSimple(*args, **kwargs)
+
+    def GetDescriptionAndCredits(*args, **kwargs):
+        """GetDescriptionAndCredits(self) -> String"""
+        return _misc_.AboutDialogInfo_GetDescriptionAndCredits(*args, **kwargs)
+
+_misc_.AboutDialogInfo_swigregister(AboutDialogInfo)
+
+
+def AboutBox(*args, **kwargs):
+  """
+    AboutBox(AboutDialogInfo info)
+
+    This function shows the standard about dialog containing the
+    information specified in ``info``. If the current platform has a
+    native about dialog which is capable of showing all the fields in
+    `wx.AboutDialogInfo`, the native dialog is used, otherwise the
+    function falls back to the generic wxWidgets version of the dialog.
+    """
+  return _misc_.AboutBox(*args, **kwargs)