wxMessageBox off the main thread lost result code.

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

diff --git a/interface/wx/utils.h b/interface/wx/utils.h
index ad37f8030cde5a5b5d9f5288fefc21691459d3e0..53fea4e6bb9a36a73f6e12451e3b40ada51fc6e6 100644 (file)
--- a/interface/wx/utils.h
+++ b/interface/wx/utils.h
@@ -2,7 +2,6 @@
 // Name:        utils.h
 // Purpose:     interface of various utility classes and functions
 // Author:      wxWidgets team
-// RCS-ID:      $Id$
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -459,7 +458,7 @@ int wxFindMenuItemId(wxFrame* frame, const wxString& menuString,
 
     @header{wx/utils.h}
 */
-wxWindowID wxNewId();
+int wxNewId();
 
 /**
     Ensures that Ids subsequently generated by wxNewId() do not clash with the
@@ -467,7 +466,7 @@ wxWindowID wxNewId();
 
     @header{wx/utils.h}
 */
-void wxRegisterId(wxWindowID id);
+void wxRegisterId(int id);
 
 /**
     Opens the @a document in the application associated with the files of this
@@ -591,7 +590,7 @@ wxLoadUserResource(const void **outData,
     @param module The @c HINSTANCE of the module to load the resources from.
         The current module is used by default. This parameter is new since
         wxWidgets 2.9.1.
-    @return A pointer to the data to be <tt>delete[]<tt>d by caller on success
+    @return A pointer to the data to be <tt>delete[]</tt>d by caller on success
         or @NULL on error.
 
     This function is available under Windows only.
@@ -1278,7 +1277,12 @@ unsigned long wxGetProcessId();
 
     @c wxSIGNONE, @c wxSIGKILL and @c wxSIGTERM have the same meaning under
     both Unix and Windows but all the other signals are equivalent to
-    @c wxSIGTERM under Windows.
+    @c wxSIGTERM under Windows. Moreover, under Windows, @c wxSIGTERM is
+    implemented by posting a message to the application window, so it only
+    works if the application does have windows. If it doesn't, as is notably
+    always the case for the console applications, you need to use @c wxSIGKILL
+    to actually kill the process. Of course, this doesn't allow the process to
+    shut down gracefully and so should be avoided if possible.
 
     Returns 0 on success, -1 on failure. If the @a rc parameter is not @NULL,
     it will be filled with a value from the @c wxKillError enum: