Deprecated methosd markup (documented).

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

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index d6566c8248bd45d70087bc4cce5b9aaf1b875f67..67eaf2b54d51041ba74d369a942a94067b8a0d3d 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -975,7 +975,7 @@ class Timer(_core.EvtHandler):
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown
         self.this = newobj.this
         self.thisown = 1
         del newobj.thisown

-        self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)
+        self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self, 0)

 
     def __del__(self, destroy=_misc_.delete_Timer):
         """__del__(self)"""
 
     def __del__(self, destroy=_misc_.delete_Timer):
         """__del__(self)"""


@@ -1019,6 +1019,10 @@ class Timer(_core.EvtHandler):
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 
         """GetId(self) -> int"""
         return _misc_.Timer_GetId(*args, **kwargs)
 

+    def Destroy():
+        """NO-OP: Timers must be destroyed by normal refrence counting"""
+        pass
+

 
 class TimerPtr(Timer):
     def __init__(self, this):
 
 class TimerPtr(Timer):
     def __init__(self, this):


@@ -1733,6 +1737,7 @@ EXEC_ASYNC = _misc_.EXEC_ASYNC
 EXEC_SYNC = _misc_.EXEC_SYNC
 EXEC_NOHIDE = _misc_.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER
 EXEC_SYNC = _misc_.EXEC_SYNC
 EXEC_NOHIDE = _misc_.EXEC_NOHIDE
 EXEC_MAKE_GROUP_LEADER = _misc_.EXEC_MAKE_GROUP_LEADER

+EXEC_NODISABLE = _misc_.EXEC_NODISABLE

 
 def Execute(*args, **kwargs):
     """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""
 
 def Execute(*args, **kwargs):
     """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long"""