Elippsis and markup support for wxStaticText

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

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index c99fc56b369ecb2a7026e72c590043acdbb4300d..b4494a06154b2058b00a8d913dcf96c9543fc200 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -316,11 +316,6 @@ def EndBusyCursor(*args):
   """EndBusyCursor()"""
   return _misc_.EndBusyCursor(*args)
 
-def GetElapsedTime(*args, **kwargs):
-  """GetElapsedTime(bool resetTimer=True) -> long"""
-  return _misc_.GetElapsedTime(*args, **kwargs)
-GetElapsedTime = wx._deprecated(GetElapsedTime) 
-
 def IsBusy(*args):
   """IsBusy() -> bool"""
   return _misc_.IsBusy(*args)
@@ -333,10 +328,6 @@ def Shell(*args, **kwargs):
   """Shell(String command=EmptyString) -> bool"""
   return _misc_.Shell(*args, **kwargs)
 
-def StartTimer(*args):
-  """StartTimer()"""
-  return _misc_.StartTimer(*args)
-
 def GetOsVersion(*args):
   """GetOsVersion() -> (platform, major, minor)"""
   return _misc_.GetOsVersion(*args)
@@ -924,7 +915,7 @@ class BusyInfo(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
-        """__init__(self, String message) -> BusyInfo"""
+        """__init__(self, String message, Window parent=None) -> BusyInfo"""
         _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyInfo
     __del__ = lambda self : None;
@@ -1277,7 +1268,7 @@ 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))
-        self._setOORInfo(self, 0);Timer._setCallbackInfo(self, self, Timer)
+        self._setOORInfo(self,0); self.this.own(True); Timer._setCallbackInfo(self, self, Timer)
 
     __swig_destroy__ = _misc_.delete_Timer
     __del__ = lambda self : None;
@@ -3307,8 +3298,26 @@ class FileConfig(ConfigBase):
         _misc_.FileConfig_swiginit(self,_misc_.new_FileConfig(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_FileConfig
     __del__ = lambda self : None;
+    def GetGlobalFileName(*args, **kwargs):
+        """GetGlobalFileName(String szFile) -> String"""
+        return _misc_.FileConfig_GetGlobalFileName(*args, **kwargs)
+
+    GetGlobalFileName = staticmethod(GetGlobalFileName)
+    def GetLocalFileName(*args, **kwargs):
+        """GetLocalFileName(String szFile, int style=0) -> String"""
+        return _misc_.FileConfig_GetLocalFileName(*args, **kwargs)
+
+    GetLocalFileName = staticmethod(GetLocalFileName)
 _misc_.FileConfig_swigregister(FileConfig)
 
+def FileConfig_GetGlobalFileName(*args, **kwargs):
+  """FileConfig_GetGlobalFileName(String szFile) -> String"""
+  return _misc_.FileConfig_GetGlobalFileName(*args, **kwargs)
+
+def FileConfig_GetLocalFileName(*args, **kwargs):
+  """FileConfig_GetLocalFileName(String szFile, int style=0) -> String"""
+  return _misc_.FileConfig_GetLocalFileName(*args, **kwargs)
+
 class ConfigPathChanger(object):
     """
     A handy little class which changes current path to the path of given
@@ -3639,6 +3648,10 @@ class DateTime(object):
         """ResetTime(self) -> DateTime"""
         return _misc_.DateTime_ResetTime(*args, **kwargs)
 
+    def GetDateOnly(*args, **kwargs):
+        """GetDateOnly(self) -> DateTime"""
+        return _misc_.DateTime_GetDateOnly(*args, **kwargs)
+
     def SetYear(*args, **kwargs):
         """SetYear(self, int year) -> DateTime"""
         return _misc_.DateTime_SetYear(*args, **kwargs)
@@ -3703,17 +3716,6 @@ class DateTime(object):
         """GetLastWeekDay(self, int weekday, int month=Inv_Month, int year=Inv_Year) -> DateTime"""
         return _misc_.DateTime_GetLastWeekDay(*args, **kwargs)
 
-    def SetToTheWeek(*args, **kwargs):
-        """SetToTheWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> bool"""
-        return _misc_.DateTime_SetToTheWeek(*args, **kwargs)
-
-    def GetWeek(*args, **kwargs):
-        """GetWeek(self, int numWeek, int weekday=Mon, int flags=Monday_First) -> DateTime"""
-        return _misc_.DateTime_GetWeek(*args, **kwargs)
-
-    SetToTheWeek = wx._deprecated(SetToTheWeek, "SetToTheWeek is deprecated, use (static) SetToWeekOfYear instead")
-    GetWeek = wx._deprecated(GetWeek, "GetWeek is deprecated, use GetWeekOfYear instead")
-
     def SetToWeekOfYear(*args, **kwargs):
         """SetToWeekOfYear(int year, int numWeek, int weekday=Mon) -> DateTime"""
         return _misc_.DateTime_SetToWeekOfYear(*args, **kwargs)
@@ -4032,7 +4034,6 @@ class DateTime(object):
     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`") 
@@ -4684,14 +4685,15 @@ class DataFormat(object):
         """
         return _misc_.DataFormat_GetType(*args, **kwargs)
 
-    def GetId(*args, **kwargs):
-        """
-        GetId(self) -> String
+    def _GetId(*args, **kwargs):
+        """_GetId(self) -> String"""
+        return _misc_.DataFormat__GetId(*args, **kwargs)
 
-        Returns the name of a custom format (this function will fail for a
-        standard format).
-        """
-        return _misc_.DataFormat_GetId(*args, **kwargs)
+    def GetId(self):
+        """Returns the name of a custom format (this function will fail for a
+     format)."""
+        nolog = wx.LogNull()
+        return self._GetId()
 
     def SetId(*args, **kwargs):
         """
@@ -5682,7 +5684,6 @@ class Clipboard(_core.Object):
         return _misc_.Clipboard_Get(*args, **kwargs)
 
     Get = staticmethod(Get)
-    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _misc_.Clipboard_swigregister(Clipboard)
 
 def Clipboard_Get(*args):