X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a68b8331cb0268648044a45903ec6519517d618d..66ffb23b392a7d02e080fdefc61b87cfe84d6df4:/wxPython/src/gtk/_misc.py diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py index c8bad6a8a4..67eaf2b54d 100644 --- 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._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)""" @@ -1019,6 +1019,10 @@ class Timer(_core.EvtHandler): """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): @@ -1586,6 +1590,8 @@ KILL_BAD_SIGNAL = _misc_.KILL_BAD_SIGNAL KILL_ACCESS_DENIED = _misc_.KILL_ACCESS_DENIED KILL_NO_PROCESS = _misc_.KILL_NO_PROCESS KILL_ERROR = _misc_.KILL_ERROR +KILL_NOCHILDREN = _misc_.KILL_NOCHILDREN +KILL_CHILDREN = _misc_.KILL_CHILDREN SIGNONE = _misc_.SIGNONE SIGHUP = _misc_.SIGHUP SIGINT = _misc_.SIGINT @@ -1607,7 +1613,7 @@ 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): - """Kill(int pid, int sig=SIGTERM) -> int""" + """Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int""" return _misc_.Process_Kill(*args, **kwargs) Kill = staticmethod(Kill) @@ -1686,7 +1692,7 @@ class ProcessPtr(Process): _misc_.Process_swigregister(ProcessPtr) def Process_Kill(*args, **kwargs): - """Process_Kill(int pid, int sig=SIGTERM) -> int""" + """Process_Kill(int pid, int sig=SIGTERM, int flags=KILL_NOCHILDREN) -> int""" return _misc_.Process_Kill(*args, **kwargs) def Process_Exists(*args, **kwargs): @@ -1731,10 +1737,15 @@ 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_NODISABLE = _misc_.EXEC_NODISABLE def Execute(*args, **kwargs): """Execute(String command, int flags=EXEC_ASYNC, Process process=None) -> long""" return _misc_.Execute(*args, **kwargs) + +def Kill(*args, **kwargs): + """Kill(long pid, int sig=SIGTERM, int rc, int flags=KILL_NOCHILDREN) -> int""" + return _misc_.Kill(*args, **kwargs) #--------------------------------------------------------------------------- JOYSTICK1 = _misc_.JOYSTICK1 @@ -2490,7 +2501,12 @@ ART_TIP = cvar.ART_TIP ART_REPORT_VIEW = cvar.ART_REPORT_VIEW ART_LIST_VIEW = cvar.ART_LIST_VIEW ART_NEW_DIR = cvar.ART_NEW_DIR +ART_HARDDISK = cvar.ART_HARDDISK +ART_FLOPPY = cvar.ART_FLOPPY +ART_CDROM = cvar.ART_CDROM +ART_REMOVABLE = cvar.ART_REMOVABLE ART_FOLDER = cvar.ART_FOLDER +ART_FOLDER_OPEN = cvar.ART_FOLDER_OPEN ART_GO_DIR_UP = cvar.ART_GO_DIR_UP ART_EXECUTABLE_FILE = cvar.ART_EXECUTABLE_FILE ART_NORMAL_FILE = cvar.ART_NORMAL_FILE @@ -5756,7 +5772,7 @@ class StandardPaths(object): """ Get() -> StandardPaths - Return the global standard paths object + Return the global standard paths singleton """ return _misc_.StandardPaths_Get(*args, **kwargs) @@ -5766,7 +5782,7 @@ class StandardPaths(object): GetConfigDir(self) -> String Return the directory with system config files: /etc under Unix, - c:\Documents and Settings\All Users\Application Data under Windows, + 'c:\Documents and Settings\All Users\Application Data' under Windows, /Library/Preferences for Mac """ return _misc_.StandardPaths_GetConfigDir(*args, **kwargs) @@ -5776,7 +5792,7 @@ class StandardPaths(object): GetUserConfigDir(self) -> String Return the directory for the user config files: $HOME under Unix, - c:\Documents and Settings\username under Windows, + 'c:\Documents and Settings\username' under Windows, and ~/Library/Preferences under Mac Only use this if you have a single file to put there, otherwise @@ -5790,7 +5806,7 @@ class StandardPaths(object): Return the location of the application's global, (i.e. not user-specific,) data files: prefix/share/appname under Unix, - c:\Program Filesppname under Windows, + 'c:\Program Files\appname' under Windows, appname.app/Contents/SharedSupport app bundle directory under Mac. """ return _misc_.StandardPaths_GetDataDir(*args, **kwargs) @@ -5811,7 +5827,7 @@ class StandardPaths(object): Return the directory for the user-dependent application data files: $HOME/.appname under Unix, c:\Documents and - Settings\username\Application Datappname under Windows and + Settings\username\Application Data\appname under Windows and ~/Library/Application Support/appname under Mac """ return _misc_.StandardPaths_GetUserDataDir(*args, **kwargs) @@ -5824,7 +5840,7 @@ class StandardPaths(object): with the other machines Same as `GetUserDataDir` for all platforms except Windows where it is - the 'Local Settings\Application Datappname' directory. + the 'Local Settings\Application Data\appname' directory. """ return _misc_.StandardPaths_GetUserLocalDataDir(*args, **kwargs) @@ -5844,7 +5860,8 @@ class StandardPaths(object): Set the program installation directory which is /usr/local by default. This value will be used by other methods such as `GetDataDir` and - `GetPluginsDir` as the prefix for what they return. (Unix only.) + `GetPluginsDir` as the prefix for what they return. (This function + only has meaning on Unix systems.) """ return _misc_.StandardPaths_SetInstallPrefix(*args, **kwargs) @@ -5852,7 +5869,8 @@ class StandardPaths(object): """ GetInstallPrefix(self) -> String - Get the program installation prefix. (Unix only.) + Get the program installation prefix. The default is the prefix where + Python is installed. (This function only has meaning on Unix systems.) """ return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs) @@ -5868,7 +5886,7 @@ def StandardPaths_Get(*args, **kwargs): """ StandardPaths_Get() -> StandardPaths - Return the global standard paths object + Return the global standard paths singleton """ return _misc_.StandardPaths_Get(*args, **kwargs)