Don't steal VK_RETURN for wxEVT_COMMAND_LIST_ITEM_ACTIVATED if any of

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

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index e2d49cd281aacc82029a585240b710d8c952b2ab..580e0229ee21ca5af480e5236bfe02ec4ada607e 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -924,7 +924,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): 
     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;
         _misc_.BusyInfo_swiginit(self,_misc_.new_BusyInfo(*args, **kwargs))
     __swig_destroy__ = _misc_.delete_BusyInfo
     __del__ = lambda self : None;


@@ -1277,7 +1277,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))
     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;
 
     __swig_destroy__ = _misc_.delete_Timer
     __del__ = lambda self : None;


@@ -6034,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