1. derived wxMSW radio box from static box because it includes the box anyhow

[wxWidgets.git] / include / wx / utils.h

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 14ed37d23f00e72bc8f6ccb75579ed8d87034a1a..a7aba4285c40f93ed8671d8d2c4b0e5d977b9bd0 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -101,7 +101,7 @@ WXDLLIMPEXP_BASE wxString wxGetDataDir();
 // Get the state of a key (true if pressed, false if not)
 // This is generally most useful getting the state of
 // the modifier or toggle keys.
 // Get the state of a key (true if pressed, false if not)
 // This is generally most useful getting the state of
 // the modifier or toggle keys.

-WXDLLEXPORT bool wxGetKeyState(const wxKeyCode& key);
+WXDLLEXPORT bool wxGetKeyState(wxKeyCode key);

 
 
 // Don't synthesize KeyUp events holding down a key and producing
 
 
 // Don't synthesize KeyUp events holding down a key and producing


@@ -156,7 +156,7 @@ WXDLLIMPEXP_BASE wxString wxDecToHex(int dec);
 // Process management
 // ----------------------------------------------------------------------------
 
 // Process management
 // ----------------------------------------------------------------------------
 

-// NB: for backwars compatibility reasons the values of wxEXEC_[A]SYNC *must*
+// NB: for backwards compatibility reasons the values of wxEXEC_[A]SYNC *must*

 //     be 0 and 1, don't change!
 
 enum
 //     be 0 and 1, don't change!
 
 enum


@@ -171,8 +171,8 @@ enum
     // is done by default)
     wxEXEC_NOHIDE   = 2,
 
     // is done by default)
     wxEXEC_NOHIDE   = 2,
 

-    // under Unix, if the process is the group leader then killing -pid kills
-    // all children as well as pid
+    // under Unix, if the process is the group leader then passing wxKILL_CHILDREN to wxKill
+    // kills all children as well as pid

     wxEXEC_MAKE_GROUP_LEADER = 4
 };
 
     wxEXEC_MAKE_GROUP_LEADER = 4
 };
 


@@ -228,6 +228,12 @@ enum wxKillError
     wxKILL_ERROR            // another, unspecified error
 };
 
     wxKILL_ERROR            // another, unspecified error
 };
 

+enum wxKillFlags
+{
+    wxKILL_NOCHILDREN = 0,  // don't kill children
+    wxKILL_CHILDREN = 1     // kill children
+};
+

 enum wxShutdownFlags
 {
     wxSHUTDOWN_POWEROFF,    // power off the computer
 enum wxShutdownFlags
 {
     wxSHUTDOWN_POWEROFF,    // power off the computer


@@ -243,7 +249,8 @@ WXDLLIMPEXP_BASE bool wxShutdown(wxShutdownFlags wFlags);
 // return detailed error in rc if not NULL
 WXDLLIMPEXP_BASE int wxKill(long pid,
                        wxSignal sig = wxSIGTERM,
 // return detailed error in rc if not NULL
 WXDLLIMPEXP_BASE int wxKill(long pid,
                        wxSignal sig = wxSIGTERM,

-                       wxKillError *rc = NULL);
+                       wxKillError *rc = NULL,
+                       int flags = wxKILL_NOCHILDREN);

 
 // Execute a command in an interactive shell window (always synchronously)
 // If no command then just the shell
 
 // Execute a command in an interactive shell window (always synchronously)
 // If no command then just the shell