Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge recent changes from 2.8 branch.

Browse Source 
Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
wxPython/src/msw/_misc.py
View File

@@ -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)
@@ -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
@@ -3707,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)
@@ -4036,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`")