Removed remaining DialogEd files

[wxWidgets.git] / wxPython / src / gtk / misc.py

diff --git a/wxPython/src/gtk/misc.py b/wxPython/src/gtk/misc.py
index 2dc11f976523e3e4db5b2297df2eeb0de2716e57..e53833458f506e2482fc4cb67d65731a60c12d4b 100644 (file)
--- a/wxPython/src/gtk/misc.py
+++ b/wxPython/src/gtk/misc.py
@@ -103,32 +103,32 @@ class SystemSettings(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetColour(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemSettings instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def GetColour(*args, **kwargs):

-        """SystemSettings.GetColour(int index) -> Colour"""
+        """GetColour(int index) -> Colour"""

         return _misc.SystemSettings_GetColour(*args, **kwargs)
 
     GetColour = staticmethod(GetColour)
     def GetFont(*args, **kwargs):
         return _misc.SystemSettings_GetColour(*args, **kwargs)
 
     GetColour = staticmethod(GetColour)
     def GetFont(*args, **kwargs):

-        """SystemSettings.GetFont(int index) -> Font"""
+        """GetFont(int index) -> Font"""

         return _misc.SystemSettings_GetFont(*args, **kwargs)
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):
         return _misc.SystemSettings_GetFont(*args, **kwargs)
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):

-        """SystemSettings.GetMetric(int index) -> int"""
+        """GetMetric(int index) -> int"""

         return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
     def HasFeature(*args, **kwargs):
         return _misc.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
     def HasFeature(*args, **kwargs):

-        """SystemSettings.HasFeature(int index) -> bool"""
+        """HasFeature(int index) -> bool"""

         return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
     HasFeature = staticmethod(HasFeature)
     def GetScreenType(*args, **kwargs):
         return _misc.SystemSettings_HasFeature(*args, **kwargs)
 
     HasFeature = staticmethod(HasFeature)
     def GetScreenType(*args, **kwargs):

-        """SystemSettings.GetScreenType() -> int"""
+        """GetScreenType() -> int"""

         return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
     GetScreenType = staticmethod(GetScreenType)
     def SetScreenType(*args, **kwargs):
         return _misc.SystemSettings_GetScreenType(*args, **kwargs)
 
     GetScreenType = staticmethod(GetScreenType)
     def SetScreenType(*args, **kwargs):

-        """SystemSettings.SetScreenType(int screen)"""
+        """SetScreenType(int screen)"""

         return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)
         return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
     SetScreenType = staticmethod(SetScreenType)


@@ -164,11 +164,6 @@ def SystemSettings_SetScreenType(*args, **kwargs):
     """SystemSettings_SetScreenType(int screen)"""
     return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 
     """SystemSettings_SetScreenType(int screen)"""
     return _misc.SystemSettings_SetScreenType(*args, **kwargs)
 

-# backwards compatibility aliasses
-SystemSettings_GetSystemColour = SystemSettings_GetColour
-SystemSettings_GetSystemFont   = SystemSettings_GetFont
-SystemSettings_GetSystemMetric = SystemSettings_GetMetric
-

 class SystemOptions(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
 class SystemOptions(core.Object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)


@@ -179,27 +174,27 @@ class SystemOptions(core.Object):
         self.thisown = 1
         del newobj.thisown
     def SetOption(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def SetOption(*args, **kwargs):

-        """SystemOptions.SetOption(String name, String value)"""
+        """SetOption(String name, String value)"""

         return _misc.SystemOptions_SetOption(*args, **kwargs)
 
     SetOption = staticmethod(SetOption)
     def SetOptionInt(*args, **kwargs):
         return _misc.SystemOptions_SetOption(*args, **kwargs)
 
     SetOption = staticmethod(SetOption)
     def SetOptionInt(*args, **kwargs):

-        """SystemOptions.SetOptionInt(String name, int value)"""
+        """SetOptionInt(String name, int value)"""

         return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
     SetOptionInt = staticmethod(SetOptionInt)
     def GetOption(*args, **kwargs):
         return _misc.SystemOptions_SetOptionInt(*args, **kwargs)
 
     SetOptionInt = staticmethod(SetOptionInt)
     def GetOption(*args, **kwargs):

-        """SystemOptions.GetOption(String name) -> String"""
+        """GetOption(String name) -> String"""

         return _misc.SystemOptions_GetOption(*args, **kwargs)
 
     GetOption = staticmethod(GetOption)
     def GetOptionInt(*args, **kwargs):
         return _misc.SystemOptions_GetOption(*args, **kwargs)
 
     GetOption = staticmethod(GetOption)
     def GetOptionInt(*args, **kwargs):

-        """SystemOptions.GetOptionInt(String name) -> int"""
+        """GetOptionInt(String name) -> int"""

         return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
     GetOptionInt = staticmethod(GetOptionInt)
     def HasOption(*args, **kwargs):
         return _misc.SystemOptions_GetOptionInt(*args, **kwargs)
 
     GetOptionInt = staticmethod(GetOptionInt)
     def HasOption(*args, **kwargs):

-        """SystemOptions.HasOption(String name) -> bool"""
+        """HasOption(String name) -> bool"""

         return _misc.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)
         return _misc.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)


@@ -350,12 +345,12 @@ def Trap(*args, **kwargs):
 
 def FileSelector(*args, **kwargs):
     """
 
 def FileSelector(*args, **kwargs):
     """

-    FileSelector(String message=wxPyFileSelectorPromptStr, String default_path=EmptyString, 
+    FileSelector(String message=FileSelectorPromptStr, String default_path=EmptyString, 

         String default_filename=EmptyString, 
         String default_extension=EmptyString, 
         String default_filename=EmptyString, 
         String default_extension=EmptyString, 

-        String wildcard=wxPyFileSelectorDefaultWildcardStr, 
-        int flags=0, Window parent=None, 
-        int x=-1, int y=-1) -> String
+        String wildcard=FileSelectorDefaultWildcardStr, 
+        int flags=0, Window parent=None, int x=-1, 
+        int y=-1) -> String

     """
     return _misc.FileSelector(*args, **kwargs)
 
     """
     return _misc.FileSelector(*args, **kwargs)
 


@@ -375,7 +370,7 @@ def SaveFileSelector(*args, **kwargs):
 
 def DirSelector(*args, **kwargs):
     """
 
 def DirSelector(*args, **kwargs):
     """

-    DirSelector(String message=wxPyDirSelectorPromptStr, String defaultPath=EmptyString, 
+    DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 

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


@@ -488,6 +483,10 @@ def GetTopLevelParent(*args, **kwargs):
     """GetTopLevelParent(Window win) -> Window"""
     return _misc.GetTopLevelParent(*args, **kwargs)
 
     """GetTopLevelParent(Window win) -> Window"""
     return _misc.GetTopLevelParent(*args, **kwargs)
 

+def GetKeyState(*args, **kwargs):
+    """GetKeyState(int key) -> bool"""
+    return _misc.GetKeyState(*args, **kwargs)
+

 def WakeUpMainThread(*args, **kwargs):
     """WakeUpMainThread()"""
     return _misc.WakeUpMainThread(*args, **kwargs)
 def WakeUpMainThread(*args, **kwargs):
     """WakeUpMainThread()"""
     return _misc.WakeUpMainThread(*args, **kwargs)


@@ -521,6 +520,10 @@ class MutexGuiLockerPtr(MutexGuiLocker):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MutexGuiLocker
 _misc.MutexGuiLocker_swigregister(MutexGuiLockerPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MutexGuiLocker
 _misc.MutexGuiLocker_swigregister(MutexGuiLockerPtr)

+cvar = _misc.cvar
+FileSelectorPromptStr = cvar.FileSelectorPromptStr
+FileSelectorDefaultWildcardStr = cvar.FileSelectorDefaultWildcardStr
+DirSelectorPromptStr = cvar.DirSelectorPromptStr

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


@@ -550,12 +553,12 @@ class ToolTip(core.Object):
         return _misc.ToolTip_GetWindow(*args, **kwargs)
 
     def Enable(*args, **kwargs):
         return _misc.ToolTip_GetWindow(*args, **kwargs)
 
     def Enable(*args, **kwargs):

-        """ToolTip.Enable(bool flag)"""
+        """Enable(bool flag)"""

         return _misc.ToolTip_Enable(*args, **kwargs)
 
     Enable = staticmethod(Enable)
     def SetDelay(*args, **kwargs):
         return _misc.ToolTip_Enable(*args, **kwargs)
 
     Enable = staticmethod(Enable)
     def SetDelay(*args, **kwargs):

-        """ToolTip.SetDelay(long milliseconds)"""
+        """SetDelay(long milliseconds)"""

         return _misc.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)
         return _misc.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)


@@ -820,6 +823,7 @@ class FileHistory(core.Object):
         """GetCount() -> int"""
         return _misc.FileHistory_GetCount(*args, **kwargs)
 
         """GetCount() -> int"""
         return _misc.FileHistory_GetCount(*args, **kwargs)
 

+    GetNoHistoryFiles = GetCount 

 
 class FileHistoryPtr(FileHistory):
     def __init__(self, this):
 
 class FileHistoryPtr(FileHistory):
     def __init__(self, this):


@@ -1090,17 +1094,17 @@ class Log(object):
         self.thisown = 1
         del newobj.thisown
     def IsEnabled(*args, **kwargs):
         self.thisown = 1
         del newobj.thisown
     def IsEnabled(*args, **kwargs):

-        """Log.IsEnabled() -> bool"""
+        """IsEnabled() -> bool"""

         return _misc.Log_IsEnabled(*args, **kwargs)
 
     IsEnabled = staticmethod(IsEnabled)
     def EnableLogging(*args, **kwargs):
         return _misc.Log_IsEnabled(*args, **kwargs)
 
     IsEnabled = staticmethod(IsEnabled)
     def EnableLogging(*args, **kwargs):

-        """Log.EnableLogging(bool doIt=True) -> bool"""
+        """EnableLogging(bool doIt=True) -> bool"""

         return _misc.Log_EnableLogging(*args, **kwargs)
 
     EnableLogging = staticmethod(EnableLogging)
     def OnLog(*args, **kwargs):
         return _misc.Log_EnableLogging(*args, **kwargs)
 
     EnableLogging = staticmethod(EnableLogging)
     def OnLog(*args, **kwargs):

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

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


@@ -1109,102 +1113,102 @@ class Log(object):
         return _misc.Log_Flush(*args, **kwargs)
 
     def FlushActive(*args, **kwargs):
         return _misc.Log_Flush(*args, **kwargs)
 
     def FlushActive(*args, **kwargs):

-        """Log.FlushActive()"""
+        """FlushActive()"""

         return _misc.Log_FlushActive(*args, **kwargs)
 
     FlushActive = staticmethod(FlushActive)
     def GetActiveTarget(*args, **kwargs):
         return _misc.Log_FlushActive(*args, **kwargs)
 
     FlushActive = staticmethod(FlushActive)
     def GetActiveTarget(*args, **kwargs):

-        """Log.GetActiveTarget() -> Log"""
+        """GetActiveTarget() -> Log"""

         return _misc.Log_GetActiveTarget(*args, **kwargs)
 
     GetActiveTarget = staticmethod(GetActiveTarget)
     def SetActiveTarget(*args, **kwargs):
         return _misc.Log_GetActiveTarget(*args, **kwargs)
 
     GetActiveTarget = staticmethod(GetActiveTarget)
     def SetActiveTarget(*args, **kwargs):

-        """Log.SetActiveTarget(Log pLogger) -> Log"""
+        """SetActiveTarget(Log pLogger) -> Log"""

         return _misc.Log_SetActiveTarget(*args, **kwargs)
 
     SetActiveTarget = staticmethod(SetActiveTarget)
     def Suspend(*args, **kwargs):
         return _misc.Log_SetActiveTarget(*args, **kwargs)
 
     SetActiveTarget = staticmethod(SetActiveTarget)
     def Suspend(*args, **kwargs):

-        """Log.Suspend()"""
+        """Suspend()"""

         return _misc.Log_Suspend(*args, **kwargs)
 
     Suspend = staticmethod(Suspend)
     def Resume(*args, **kwargs):
         return _misc.Log_Suspend(*args, **kwargs)
 
     Suspend = staticmethod(Suspend)
     def Resume(*args, **kwargs):

-        """Log.Resume()"""
+        """Resume()"""

         return _misc.Log_Resume(*args, **kwargs)
 
     Resume = staticmethod(Resume)
     def SetVerbose(*args, **kwargs):
         return _misc.Log_Resume(*args, **kwargs)
 
     Resume = staticmethod(Resume)
     def SetVerbose(*args, **kwargs):

-        """Log.SetVerbose(bool bVerbose=True)"""
+        """SetVerbose(bool bVerbose=True)"""

         return _misc.Log_SetVerbose(*args, **kwargs)
 
     SetVerbose = staticmethod(SetVerbose)
     def SetLogLevel(*args, **kwargs):
         return _misc.Log_SetVerbose(*args, **kwargs)
 
     SetVerbose = staticmethod(SetVerbose)
     def SetLogLevel(*args, **kwargs):

-        """Log.SetLogLevel(wxLogLevel logLevel)"""
+        """SetLogLevel(wxLogLevel logLevel)"""

         return _misc.Log_SetLogLevel(*args, **kwargs)
 
     SetLogLevel = staticmethod(SetLogLevel)
     def DontCreateOnDemand(*args, **kwargs):
         return _misc.Log_SetLogLevel(*args, **kwargs)
 
     SetLogLevel = staticmethod(SetLogLevel)
     def DontCreateOnDemand(*args, **kwargs):

-        """Log.DontCreateOnDemand()"""
+        """DontCreateOnDemand()"""

         return _misc.Log_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetTraceMask(*args, **kwargs):
         return _misc.Log_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
     def SetTraceMask(*args, **kwargs):

-        """Log.SetTraceMask(wxTraceMask ulMask)"""
+        """SetTraceMask(wxTraceMask ulMask)"""

         return _misc.Log_SetTraceMask(*args, **kwargs)
 
     SetTraceMask = staticmethod(SetTraceMask)
     def AddTraceMask(*args, **kwargs):
         return _misc.Log_SetTraceMask(*args, **kwargs)
 
     SetTraceMask = staticmethod(SetTraceMask)
     def AddTraceMask(*args, **kwargs):

-        """Log.AddTraceMask(String str)"""
+        """AddTraceMask(String str)"""

         return _misc.Log_AddTraceMask(*args, **kwargs)
 
     AddTraceMask = staticmethod(AddTraceMask)
     def RemoveTraceMask(*args, **kwargs):
         return _misc.Log_AddTraceMask(*args, **kwargs)
 
     AddTraceMask = staticmethod(AddTraceMask)
     def RemoveTraceMask(*args, **kwargs):

-        """Log.RemoveTraceMask(String str)"""
+        """RemoveTraceMask(String str)"""

         return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
     RemoveTraceMask = staticmethod(RemoveTraceMask)
     def ClearTraceMasks(*args, **kwargs):
         return _misc.Log_RemoveTraceMask(*args, **kwargs)
 
     RemoveTraceMask = staticmethod(RemoveTraceMask)
     def ClearTraceMasks(*args, **kwargs):

-        """Log.ClearTraceMasks()"""
+        """ClearTraceMasks()"""

         return _misc.Log_ClearTraceMasks(*args, **kwargs)
 
     ClearTraceMasks = staticmethod(ClearTraceMasks)
     def GetTraceMasks(*args, **kwargs):
         return _misc.Log_ClearTraceMasks(*args, **kwargs)
 
     ClearTraceMasks = staticmethod(ClearTraceMasks)
     def GetTraceMasks(*args, **kwargs):

-        """Log.GetTraceMasks() -> wxArrayString"""
+        """GetTraceMasks() -> wxArrayString"""

         return _misc.Log_GetTraceMasks(*args, **kwargs)
 
     GetTraceMasks = staticmethod(GetTraceMasks)
     def SetTimestamp(*args, **kwargs):
         return _misc.Log_GetTraceMasks(*args, **kwargs)
 
     GetTraceMasks = staticmethod(GetTraceMasks)
     def SetTimestamp(*args, **kwargs):

-        """Log.SetTimestamp(wxChar ts)"""
+        """SetTimestamp(wxChar ts)"""

         return _misc.Log_SetTimestamp(*args, **kwargs)
 
     SetTimestamp = staticmethod(SetTimestamp)
     def GetVerbose(*args, **kwargs):
         return _misc.Log_SetTimestamp(*args, **kwargs)
 
     SetTimestamp = staticmethod(SetTimestamp)
     def GetVerbose(*args, **kwargs):

-        """Log.GetVerbose() -> bool"""
+        """GetVerbose() -> bool"""

         return _misc.Log_GetVerbose(*args, **kwargs)
 
     GetVerbose = staticmethod(GetVerbose)
     def GetTraceMask(*args, **kwargs):
         return _misc.Log_GetVerbose(*args, **kwargs)
 
     GetVerbose = staticmethod(GetVerbose)
     def GetTraceMask(*args, **kwargs):

-        """Log.GetTraceMask() -> wxTraceMask"""
+        """GetTraceMask() -> wxTraceMask"""

         return _misc.Log_GetTraceMask(*args, **kwargs)
 
     GetTraceMask = staticmethod(GetTraceMask)
     def IsAllowedTraceMask(*args, **kwargs):
         return _misc.Log_GetTraceMask(*args, **kwargs)
 
     GetTraceMask = staticmethod(GetTraceMask)
     def IsAllowedTraceMask(*args, **kwargs):

-        """Log.IsAllowedTraceMask(wxChar mask) -> bool"""
+        """IsAllowedTraceMask(wxChar mask) -> bool"""

         return _misc.Log_IsAllowedTraceMask(*args, **kwargs)
 
     IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
     def GetLogLevel(*args, **kwargs):
         return _misc.Log_IsAllowedTraceMask(*args, **kwargs)
 
     IsAllowedTraceMask = staticmethod(IsAllowedTraceMask)
     def GetLogLevel(*args, **kwargs):

-        """Log.GetLogLevel() -> wxLogLevel"""
+        """GetLogLevel() -> wxLogLevel"""

         return _misc.Log_GetLogLevel(*args, **kwargs)
 
     GetLogLevel = staticmethod(GetLogLevel)
     def GetTimestamp(*args, **kwargs):
         return _misc.Log_GetLogLevel(*args, **kwargs)
 
     GetLogLevel = staticmethod(GetLogLevel)
     def GetTimestamp(*args, **kwargs):

-        """Log.GetTimestamp() -> wxChar"""
+        """GetTimestamp() -> wxChar"""

         return _misc.Log_GetTimestamp(*args, **kwargs)
 
     GetTimestamp = staticmethod(GetTimestamp)
     def TimeStamp(*args, **kwargs):
         return _misc.Log_GetTimestamp(*args, **kwargs)
 
     GetTimestamp = staticmethod(GetTimestamp)
     def TimeStamp(*args, **kwargs):

-        """Log.TimeStamp() -> String"""
+        """TimeStamp() -> String"""

         return _misc.Log_TimeStamp(*args, **kwargs)
 
     TimeStamp = staticmethod(TimeStamp)
         return _misc.Log_TimeStamp(*args, **kwargs)
 
     TimeStamp = staticmethod(TimeStamp)


@@ -1572,17 +1576,17 @@ class Process(core.EvtHandler):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Kill(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxPyProcess instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Kill(*args, **kwargs):

-        """Process.Kill(int pid, int sig=SIGTERM) -> int"""
+        """Kill(int pid, int sig=SIGTERM) -> int"""

         return _misc.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)
     def Exists(*args, **kwargs):
         return _misc.Process_Kill(*args, **kwargs)
 
     Kill = staticmethod(Kill)
     def Exists(*args, **kwargs):

-        """Process.Exists(int pid) -> bool"""
+        """Exists(int pid) -> bool"""

         return _misc.Process_Exists(*args, **kwargs)
 
     Exists = staticmethod(Exists)
     def Open(*args, **kwargs):
         return _misc.Process_Exists(*args, **kwargs)
 
     Exists = staticmethod(Exists)
     def Open(*args, **kwargs):

-        """Process.Open(String cmd, int flags=EXEC_ASYNC) -> Process"""
+        """Open(String cmd, int flags=EXEC_ASYNC) -> Process"""

         return _misc.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)
         return _misc.Process_Open(*args, **kwargs)
 
     Open = staticmethod(Open)


@@ -2158,7 +2162,7 @@ class FileType(object):
         return _misc.FileType_GetExtensions(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
         return _misc.FileType_GetExtensions(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):

-        """GetIcon() -> wxIcon"""
+        """GetIcon() -> Icon"""

         return _misc.FileType_GetIcon(*args, **kwargs)
 
     def GetIconInfo(*args, **kwargs):
         return _misc.FileType_GetIcon(*args, **kwargs)
 
     def GetIconInfo(*args, **kwargs):


@@ -2194,7 +2198,7 @@ class FileType(object):
         return _misc.FileType_Unassociate(*args, **kwargs)
 
     def ExpandCommand(*args, **kwargs):
         return _misc.FileType_Unassociate(*args, **kwargs)
 
     def ExpandCommand(*args, **kwargs):

-        """FileType.ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""
+        """ExpandCommand(String command, String filename, String mimetype=EmptyString) -> String"""

         return _misc.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)
         return _misc.FileType_ExpandCommand(*args, **kwargs)
 
     ExpandCommand = staticmethod(ExpandCommand)


@@ -2214,7 +2218,7 @@ class MimeTypesManager(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def IsOfType(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxMimeTypesManager instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def IsOfType(*args, **kwargs):

-        """MimeTypesManager.IsOfType(String mimeType, String wildcard) -> bool"""
+        """IsOfType(String mimeType, String wildcard) -> bool"""

         return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)
         return _misc.MimeTypesManager_IsOfType(*args, **kwargs)
 
     IsOfType = staticmethod(IsOfType)


@@ -2277,7 +2281,6 @@ class MimeTypesManagerPtr(MimeTypesManager):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MimeTypesManager
 _misc.MimeTypesManager_swigregister(MimeTypesManagerPtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = MimeTypesManager
 _misc.MimeTypesManager_swigregister(MimeTypesManagerPtr)

-cvar = _misc.cvar

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


@@ -2303,7 +2306,7 @@ class ArtProvider(object):
 
     def PushProvider(*args, **kwargs):
         """
 
     def PushProvider(*args, **kwargs):
         """

-        ArtProvider.PushProvider(ArtProvider provider)
+        PushProvider(ArtProvider provider)

 
         Add new provider to the top of providers stack.
         """
 
         Add new provider to the top of providers stack.
         """


@@ -2312,7 +2315,7 @@ class ArtProvider(object):
     PushProvider = staticmethod(PushProvider)
     def PopProvider(*args, **kwargs):
         """
     PushProvider = staticmethod(PushProvider)
     def PopProvider(*args, **kwargs):
         """

-        ArtProvider.PopProvider() -> bool
+        PopProvider() -> bool

 
         Remove latest added provider and delete it.
         """
 
         Remove latest added provider and delete it.
         """


@@ -2321,7 +2324,7 @@ class ArtProvider(object):
     PopProvider = staticmethod(PopProvider)
     def RemoveProvider(*args, **kwargs):
         """
     PopProvider = staticmethod(PopProvider)
     def RemoveProvider(*args, **kwargs):
         """

-        ArtProvider.RemoveProvider(ArtProvider provider) -> bool
+        RemoveProvider(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.


@@ -2331,7 +2334,7 @@ class ArtProvider(object):
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):
         """
     RemoveProvider = staticmethod(RemoveProvider)
     def GetBitmap(*args, **kwargs):
         """

-        ArtProvider.GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
+        GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap

 
         Query the providers for bitmap with given ID and return it. Return
         wx.NullBitmap if no provider provides it.
 
         Query the providers for bitmap with given ID and return it. Return
         wx.NullBitmap if no provider provides it.


@@ -2341,7 +2344,7 @@ class ArtProvider(object):
     GetBitmap = staticmethod(GetBitmap)
     def GetIcon(*args, **kwargs):
         """
     GetBitmap = staticmethod(GetBitmap)
     def GetIcon(*args, **kwargs):
         """

-        ArtProvider.GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> wxIcon
+        GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon

 
         Query the providers for icon with given ID and return it. Return
         wx.NullIcon if no provider provides it.
 
         Query the providers for icon with given ID and return it. Return
         wx.NullIcon if no provider provides it.


@@ -2435,7 +2438,7 @@ def ArtProvider_GetBitmap(*args, **kwargs):
 
 def ArtProvider_GetIcon(*args, **kwargs):
     """
 
 def ArtProvider_GetIcon(*args, **kwargs):
     """

-    ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> wxIcon
+    ArtProvider_GetIcon(String id, String client=ART_OTHER, Size size=DefaultSize) -> Icon

 
     Query the providers for icon with given ID and return it. Return
     wx.NullIcon if no provider provides it.
 
     Query the providers for icon with given ID and return it. Return
     wx.NullIcon if no provider provides it.


@@ -2464,22 +2467,22 @@ class ConfigBase(object):
     Type_Integer = _misc.ConfigBase_Type_Integer
     Type_Float = _misc.ConfigBase_Type_Float
     def Set(*args, **kwargs):
     Type_Integer = _misc.ConfigBase_Type_Integer
     Type_Float = _misc.ConfigBase_Type_Float
     def Set(*args, **kwargs):

-        """ConfigBase.Set(ConfigBase pConfig) -> ConfigBase"""
+        """Set(ConfigBase pConfig) -> ConfigBase"""

         return _misc.ConfigBase_Set(*args, **kwargs)
 
     Set = staticmethod(Set)
     def Get(*args, **kwargs):
         return _misc.ConfigBase_Set(*args, **kwargs)
 
     Set = staticmethod(Set)
     def Get(*args, **kwargs):

-        """ConfigBase.Get(bool createOnDemand=True) -> ConfigBase"""
+        """Get(bool createOnDemand=True) -> ConfigBase"""

         return _misc.ConfigBase_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
     def Create(*args, **kwargs):
         return _misc.ConfigBase_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
     def Create(*args, **kwargs):

-        """ConfigBase.Create() -> ConfigBase"""
+        """Create() -> ConfigBase"""

         return _misc.ConfigBase_Create(*args, **kwargs)
 
     Create = staticmethod(Create)
     def DontCreateOnDemand(*args, **kwargs):
         return _misc.ConfigBase_Create(*args, **kwargs)
 
     Create = staticmethod(Create)
     def DontCreateOnDemand(*args, **kwargs):

-        """ConfigBase.DontCreateOnDemand()"""
+        """DontCreateOnDemand()"""

         return _misc.ConfigBase_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)
         return _misc.ConfigBase_DontCreateOnDemand(*args, **kwargs)
 
     DontCreateOnDemand = staticmethod(DontCreateOnDemand)


@@ -2901,62 +2904,62 @@ class DateTime(object):
     Monday_First = _misc.DateTime_Monday_First
     Sunday_First = _misc.DateTime_Sunday_First
     def SetCountry(*args, **kwargs):
     Monday_First = _misc.DateTime_Monday_First
     Sunday_First = _misc.DateTime_Sunday_First
     def SetCountry(*args, **kwargs):

-        """DateTime.SetCountry(int country)"""
+        """SetCountry(int country)"""

         return _misc.DateTime_SetCountry(*args, **kwargs)
 
     SetCountry = staticmethod(SetCountry)
     def GetCountry(*args, **kwargs):
         return _misc.DateTime_SetCountry(*args, **kwargs)
 
     SetCountry = staticmethod(SetCountry)
     def GetCountry(*args, **kwargs):

-        """DateTime.GetCountry() -> int"""
+        """GetCountry() -> int"""

         return _misc.DateTime_GetCountry(*args, **kwargs)
 
     GetCountry = staticmethod(GetCountry)
     def IsWestEuropeanCountry(*args, **kwargs):
         return _misc.DateTime_GetCountry(*args, **kwargs)
 
     GetCountry = staticmethod(GetCountry)
     def IsWestEuropeanCountry(*args, **kwargs):

-        """DateTime.IsWestEuropeanCountry(int country=Country_Default) -> bool"""
+        """IsWestEuropeanCountry(int country=Country_Default) -> bool"""

         return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
     IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry)
     def GetCurrentYear(*args, **kwargs):
         return _misc.DateTime_IsWestEuropeanCountry(*args, **kwargs)
 
     IsWestEuropeanCountry = staticmethod(IsWestEuropeanCountry)
     def GetCurrentYear(*args, **kwargs):

-        """DateTime.GetCurrentYear(int cal=Gregorian) -> int"""
+        """GetCurrentYear(int cal=Gregorian) -> int"""

         return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
     GetCurrentYear = staticmethod(GetCurrentYear)
     def ConvertYearToBC(*args, **kwargs):
         return _misc.DateTime_GetCurrentYear(*args, **kwargs)
 
     GetCurrentYear = staticmethod(GetCurrentYear)
     def ConvertYearToBC(*args, **kwargs):

-        """DateTime.ConvertYearToBC(int year) -> int"""
+        """ConvertYearToBC(int year) -> int"""

         return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
 
     ConvertYearToBC = staticmethod(ConvertYearToBC)
     def GetCurrentMonth(*args, **kwargs):
         return _misc.DateTime_ConvertYearToBC(*args, **kwargs)
 
     ConvertYearToBC = staticmethod(ConvertYearToBC)
     def GetCurrentMonth(*args, **kwargs):

-        """DateTime.GetCurrentMonth(int cal=Gregorian) -> int"""
+        """GetCurrentMonth(int cal=Gregorian) -> int"""

         return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
     GetCurrentMonth = staticmethod(GetCurrentMonth)
     def IsLeapYear(*args, **kwargs):
         return _misc.DateTime_GetCurrentMonth(*args, **kwargs)
 
     GetCurrentMonth = staticmethod(GetCurrentMonth)
     def IsLeapYear(*args, **kwargs):

-        """DateTime.IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""
+        """IsLeapYear(int year=Inv_Year, int cal=Gregorian) -> bool"""

         return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
     IsLeapYear = staticmethod(IsLeapYear)
     def GetCentury(*args, **kwargs):
         return _misc.DateTime_IsLeapYear(*args, **kwargs)
 
     IsLeapYear = staticmethod(IsLeapYear)
     def GetCentury(*args, **kwargs):

-        """DateTime.GetCentury(int year=Inv_Year) -> int"""
+        """GetCentury(int year=Inv_Year) -> int"""

         return _misc.DateTime_GetCentury(*args, **kwargs)
 
     GetCentury = staticmethod(GetCentury)
     def GetNumberOfDaysinYear(*args, **kwargs):
         return _misc.DateTime_GetCentury(*args, **kwargs)
 
     GetCentury = staticmethod(GetCentury)
     def GetNumberOfDaysinYear(*args, **kwargs):

-        """DateTime.GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""
+        """GetNumberOfDaysinYear(int year, int cal=Gregorian) -> int"""

         return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
     GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear)
     def GetNumberOfDaysInMonth(*args, **kwargs):
         return _misc.DateTime_GetNumberOfDaysinYear(*args, **kwargs)
 
     GetNumberOfDaysinYear = staticmethod(GetNumberOfDaysinYear)
     def GetNumberOfDaysInMonth(*args, **kwargs):

-        """DateTime.GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""
+        """GetNumberOfDaysInMonth(int month, int year=Inv_Year, int cal=Gregorian) -> int"""

         return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
     GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth)
     def GetMonthName(*args, **kwargs):
         return _misc.DateTime_GetNumberOfDaysInMonth(*args, **kwargs)
 
     GetNumberOfDaysInMonth = staticmethod(GetNumberOfDaysInMonth)
     def GetMonthName(*args, **kwargs):

-        """DateTime.GetMonthName(int month, int flags=Name_Full) -> String"""
+        """GetMonthName(int month, int flags=Name_Full) -> String"""

         return _misc.DateTime_GetMonthName(*args, **kwargs)
 
     GetMonthName = staticmethod(GetMonthName)
     def GetWeekDayName(*args, **kwargs):
         return _misc.DateTime_GetMonthName(*args, **kwargs)
 
     GetMonthName = staticmethod(GetMonthName)
     def GetWeekDayName(*args, **kwargs):

-        """DateTime.GetWeekDayName(int weekday, int flags=Name_Full) -> String"""
+        """GetWeekDayName(int weekday, int flags=Name_Full) -> String"""

         return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
     GetWeekDayName = staticmethod(GetWeekDayName)
         return _misc.DateTime_GetWeekDayName(*args, **kwargs)
 
     GetWeekDayName = staticmethod(GetWeekDayName)


@@ -2970,32 +2973,32 @@ class DateTime(object):
 
     GetAmPmStrings = staticmethod(GetAmPmStrings)
     def IsDSTApplicable(*args, **kwargs):
 
     GetAmPmStrings = staticmethod(GetAmPmStrings)
     def IsDSTApplicable(*args, **kwargs):

-        """DateTime.IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""
+        """IsDSTApplicable(int year=Inv_Year, int country=Country_Default) -> bool"""

         return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
     IsDSTApplicable = staticmethod(IsDSTApplicable)
     def GetBeginDST(*args, **kwargs):
         return _misc.DateTime_IsDSTApplicable(*args, **kwargs)
 
     IsDSTApplicable = staticmethod(IsDSTApplicable)
     def GetBeginDST(*args, **kwargs):

-        """DateTime.GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
+        """GetBeginDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

         return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
     GetBeginDST = staticmethod(GetBeginDST)
     def GetEndDST(*args, **kwargs):
         return _misc.DateTime_GetBeginDST(*args, **kwargs)
 
     GetBeginDST = staticmethod(GetBeginDST)
     def GetEndDST(*args, **kwargs):

-        """DateTime.GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""
+        """GetEndDST(int year=Inv_Year, int country=Country_Default) -> DateTime"""

         return _misc.DateTime_GetEndDST(*args, **kwargs)
 
     GetEndDST = staticmethod(GetEndDST)
     def Now(*args, **kwargs):
         return _misc.DateTime_GetEndDST(*args, **kwargs)
 
     GetEndDST = staticmethod(GetEndDST)
     def Now(*args, **kwargs):

-        """DateTime.Now() -> DateTime"""
+        """Now() -> DateTime"""

         return _misc.DateTime_Now(*args, **kwargs)
 
     Now = staticmethod(Now)
     def UNow(*args, **kwargs):
         return _misc.DateTime_Now(*args, **kwargs)
 
     Now = staticmethod(Now)
     def UNow(*args, **kwargs):

-        """DateTime.UNow() -> DateTime"""
+        """UNow() -> DateTime"""

         return _misc.DateTime_UNow(*args, **kwargs)
 
     UNow = staticmethod(UNow)
     def Today(*args, **kwargs):
         return _misc.DateTime_UNow(*args, **kwargs)
 
     UNow = staticmethod(UNow)
     def Today(*args, **kwargs):

-        """DateTime.Today() -> DateTime"""
+        """Today() -> DateTime"""

         return _misc.DateTime_Today(*args, **kwargs)
 
     Today = staticmethod(Today)
         return _misc.DateTime_Today(*args, **kwargs)
 
     Today = staticmethod(Today)


@@ -3332,7 +3335,7 @@ class DateTime(object):
         return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):
         return _misc.DateTime_ParseRfc822Date(*args, **kwargs)
 
     def ParseFormat(*args, **kwargs):

-        """ParseFormat(String date, String format=wxPyDateFormatStr, DateTime dateDef=wxDefaultDateTime) -> int"""
+        """ParseFormat(String date, String format=DateFormatStr, DateTime dateDef=wxDefaultDateTime) -> int"""

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


@@ -3348,7 +3351,7 @@ class DateTime(object):
         return _misc.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc.DateTime_ParseTime(*args, **kwargs)
 
     def Format(*args, **kwargs):

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

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


@@ -3379,6 +3382,8 @@ class DateTimePtr(DateTime):
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = DateTime
 _misc.DateTime_swigregister(DateTimePtr)
         if not hasattr(self,"thisown"): self.thisown = 0
         self.__class__ = DateTime
 _misc.DateTime_swigregister(DateTimePtr)

+DateFormatStr = cvar.DateFormatStr
+TimeSpanFormatStr = cvar.TimeSpanFormatStr

 
 def DateTime_SetCountry(*args, **kwargs):
     """DateTime_SetCountry(int country)"""
 
 def DateTime_SetCountry(*args, **kwargs):
     """DateTime_SetCountry(int country)"""


@@ -3491,52 +3496,52 @@ class TimeSpan(object):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Seconds(*args, **kwargs):
     def __repr__(self):
         return "<%s.%s; proxy of C++ wxTimeSpan instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def Seconds(*args, **kwargs):

-        """TimeSpan.Seconds(long sec) -> TimeSpan"""
+        """Seconds(long sec) -> TimeSpan"""

         return _misc.TimeSpan_Seconds(*args, **kwargs)
 
     Seconds = staticmethod(Seconds)
     def Second(*args, **kwargs):
         return _misc.TimeSpan_Seconds(*args, **kwargs)
 
     Seconds = staticmethod(Seconds)
     def Second(*args, **kwargs):

-        """TimeSpan.Second() -> TimeSpan"""
+        """Second() -> TimeSpan"""

         return _misc.TimeSpan_Second(*args, **kwargs)
 
     Second = staticmethod(Second)
     def Minutes(*args, **kwargs):
         return _misc.TimeSpan_Second(*args, **kwargs)
 
     Second = staticmethod(Second)
     def Minutes(*args, **kwargs):

-        """TimeSpan.Minutes(long min) -> TimeSpan"""
+        """Minutes(long min) -> TimeSpan"""

         return _misc.TimeSpan_Minutes(*args, **kwargs)
 
     Minutes = staticmethod(Minutes)
     def Minute(*args, **kwargs):
         return _misc.TimeSpan_Minutes(*args, **kwargs)
 
     Minutes = staticmethod(Minutes)
     def Minute(*args, **kwargs):

-        """TimeSpan.Minute() -> TimeSpan"""
+        """Minute() -> TimeSpan"""

         return _misc.TimeSpan_Minute(*args, **kwargs)
 
     Minute = staticmethod(Minute)
     def Hours(*args, **kwargs):
         return _misc.TimeSpan_Minute(*args, **kwargs)
 
     Minute = staticmethod(Minute)
     def Hours(*args, **kwargs):

-        """TimeSpan.Hours(long hours) -> TimeSpan"""
+        """Hours(long hours) -> TimeSpan"""

         return _misc.TimeSpan_Hours(*args, **kwargs)
 
     Hours = staticmethod(Hours)
     def Hour(*args, **kwargs):
         return _misc.TimeSpan_Hours(*args, **kwargs)
 
     Hours = staticmethod(Hours)
     def Hour(*args, **kwargs):

-        """TimeSpan.Hour() -> TimeSpan"""
+        """Hour() -> TimeSpan"""

         return _misc.TimeSpan_Hour(*args, **kwargs)
 
     Hour = staticmethod(Hour)
     def Days(*args, **kwargs):
         return _misc.TimeSpan_Hour(*args, **kwargs)
 
     Hour = staticmethod(Hour)
     def Days(*args, **kwargs):

-        """TimeSpan.Days(long days) -> TimeSpan"""
+        """Days(long days) -> TimeSpan"""

         return _misc.TimeSpan_Days(*args, **kwargs)
 
     Days = staticmethod(Days)
     def Day(*args, **kwargs):
         return _misc.TimeSpan_Days(*args, **kwargs)
 
     Days = staticmethod(Days)
     def Day(*args, **kwargs):

-        """TimeSpan.Day() -> TimeSpan"""
+        """Day() -> TimeSpan"""

         return _misc.TimeSpan_Day(*args, **kwargs)
 
     Day = staticmethod(Day)
     def Weeks(*args, **kwargs):
         return _misc.TimeSpan_Day(*args, **kwargs)
 
     Day = staticmethod(Day)
     def Weeks(*args, **kwargs):

-        """TimeSpan.Weeks(long days) -> TimeSpan"""
+        """Weeks(long days) -> TimeSpan"""

         return _misc.TimeSpan_Weeks(*args, **kwargs)
 
     Weeks = staticmethod(Weeks)
     def Week(*args, **kwargs):
         return _misc.TimeSpan_Weeks(*args, **kwargs)
 
     Weeks = staticmethod(Weeks)
     def Week(*args, **kwargs):

-        """TimeSpan.Week() -> TimeSpan"""
+        """Week() -> TimeSpan"""

         return _misc.TimeSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)
         return _misc.TimeSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)


@@ -3677,7 +3682,7 @@ class TimeSpan(object):
         return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):
         return _misc.TimeSpan_GetMilliseconds(*args, **kwargs)
 
     def Format(*args, **kwargs):

-        """Format(String format=wxPyTimeSpanFormatStr) -> String"""
+        """Format(String format=TimeSpanFormatStr) -> String"""

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


@@ -3749,42 +3754,42 @@ class DateSpan(object):
         except: pass
 
     def Days(*args, **kwargs):
         except: pass
 
     def Days(*args, **kwargs):

-        """DateSpan.Days(int days) -> DateSpan"""
+        """Days(int days) -> DateSpan"""

         return _misc.DateSpan_Days(*args, **kwargs)
 
     Days = staticmethod(Days)
     def Day(*args, **kwargs):
         return _misc.DateSpan_Days(*args, **kwargs)
 
     Days = staticmethod(Days)
     def Day(*args, **kwargs):

-        """DateSpan.Day() -> DateSpan"""
+        """Day() -> DateSpan"""

         return _misc.DateSpan_Day(*args, **kwargs)
 
     Day = staticmethod(Day)
     def Weeks(*args, **kwargs):
         return _misc.DateSpan_Day(*args, **kwargs)
 
     Day = staticmethod(Day)
     def Weeks(*args, **kwargs):

-        """DateSpan.Weeks(int weeks) -> DateSpan"""
+        """Weeks(int weeks) -> DateSpan"""

         return _misc.DateSpan_Weeks(*args, **kwargs)
 
     Weeks = staticmethod(Weeks)
     def Week(*args, **kwargs):
         return _misc.DateSpan_Weeks(*args, **kwargs)
 
     Weeks = staticmethod(Weeks)
     def Week(*args, **kwargs):

-        """DateSpan.Week() -> DateSpan"""
+        """Week() -> DateSpan"""

         return _misc.DateSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)
     def Months(*args, **kwargs):
         return _misc.DateSpan_Week(*args, **kwargs)
 
     Week = staticmethod(Week)
     def Months(*args, **kwargs):

-        """DateSpan.Months(int mon) -> DateSpan"""
+        """Months(int mon) -> DateSpan"""

         return _misc.DateSpan_Months(*args, **kwargs)
 
     Months = staticmethod(Months)
     def Month(*args, **kwargs):
         return _misc.DateSpan_Months(*args, **kwargs)
 
     Months = staticmethod(Months)
     def Month(*args, **kwargs):

-        """DateSpan.Month() -> DateSpan"""
+        """Month() -> DateSpan"""

         return _misc.DateSpan_Month(*args, **kwargs)
 
     Month = staticmethod(Month)
     def Years(*args, **kwargs):
         return _misc.DateSpan_Month(*args, **kwargs)
 
     Month = staticmethod(Month)
     def Years(*args, **kwargs):

-        """DateSpan.Years(int years) -> DateSpan"""
+        """Years(int years) -> DateSpan"""

         return _misc.DateSpan_Years(*args, **kwargs)
 
     Years = staticmethod(Years)
     def Year(*args, **kwargs):
         return _misc.DateSpan_Years(*args, **kwargs)
 
     Years = staticmethod(Years)
     def Year(*args, **kwargs):

-        """DateSpan.Year() -> DateSpan"""
+        """Year() -> DateSpan"""

         return _misc.DateSpan_Year(*args, **kwargs)
 
     Year = staticmethod(Year)
         return _misc.DateSpan_Year(*args, **kwargs)
 
     Year = staticmethod(Year)


@@ -4126,9 +4131,7 @@ class DataObjectComposite(DataObject):
         del newobj.thisown
     def Add(*args, **kwargs):
         """Add(DataObjectSimple dataObject, int preferred=False)"""
         del newobj.thisown
     def Add(*args, **kwargs):
         """Add(DataObjectSimple dataObject, int preferred=False)"""

-        val = _misc.DataObjectComposite_Add(*args, **kwargs)
-        args[1].thisown = 0
-        return val
+        return _misc.DataObjectComposite_Add(*args, **kwargs)

 
 
 class DataObjectCompositePtr(DataObjectComposite):
 
 
 class DataObjectCompositePtr(DataObjectComposite):


@@ -4354,8 +4357,8 @@ class DropSource(object):
         return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """
         return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
     def __init__(self, *args, **kwargs):
         """

-        __init__(Window win=None, wxIcon copy=wxNullIcon, wxIcon move=wxNullIcon, 
-            wxIcon none=wxNullIcon) -> DropSource
+        __init__(Window win, Icon copy=wxNullIcon, Icon move=wxNullIcon, 
+            Icon none=wxNullIcon) -> DropSource

         """
         newobj = _misc.new_DropSource(*args, **kwargs)
         self.this = newobj.this
         """
         newobj = _misc.new_DropSource(*args, **kwargs)
         self.this = newobj.this


@@ -4408,7 +4411,6 @@ class DropTarget(object):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        if args: args[0].thisown = 0;

         self._setCallbackInfo(self, DropTarget)
 
     def _setCallbackInfo(*args, **kwargs):
         self._setCallbackInfo(self, DropTarget)
 
     def _setCallbackInfo(*args, **kwargs):


@@ -4427,9 +4429,7 @@ class DropTarget(object):
 
     def SetDataObject(*args, **kwargs):
         """SetDataObject(DataObject dataObject)"""
 
     def SetDataObject(*args, **kwargs):
         """SetDataObject(DataObject dataObject)"""

-        val = _misc.DropTarget_SetDataObject(*args, **kwargs)
-        args[1].thisown = 0
-        return val
+        return _misc.DropTarget_SetDataObject(*args, **kwargs)

 
     def base_OnEnter(*args, **kwargs):
         """base_OnEnter(int x, int y, int def) -> int"""
 
     def base_OnEnter(*args, **kwargs):
         """base_OnEnter(int x, int y, int def) -> int"""