Lots of fixes for OS/2

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

diff --git a/include/wx/thread.h b/include/wx/thread.h
index c4f09dc254d721780cb612864bf9e21f0be87204..72c708e51ffef4f5b3e693a5908ba13547fd0d46 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -286,6 +286,16 @@ public:
         // Returns -1 if unknown, number of CPUs otherwise
     static int GetCPUCount();
 
+        // Get the platform specific thread ID and return as a long.  This
+        // can be used to uniquely identify threads, even if they are not
+        // wxThreads.  This is used by wxPython.
+       // On VMS thread pointers are 64 bits (also needed for other systems???
+#ifdef __VMS
+   static unsigned long long GetCurrentId();
+#else
+   static unsigned long GetCurrentId();
+#endif
+   
         // sets the concurrency level: this is, roughly, the number of threads
         // the system tries to schedule to run in parallel. 0 means the
         // default value (usually acceptable, but may not yield the best
@@ -307,11 +317,7 @@ public:
         // platforms that support that - call Run() to start it
         // (special cased for watcom which won't accept 0 default)
 
-#ifdef __WATCOMC__
-    wxThreadError Create(unsigned int stackSize = 10240);
-#else
     wxThreadError Create(unsigned int stackSize = 0);
-#endif
 
         // starts execution of the thread - from the moment Run() is called
         // the execution of wxThread::Entry() may start at any moment, caller
@@ -380,7 +386,7 @@ public:
 #else
    unsigned long GetId() const;
 #endif
-   
+
     // called when the thread exits - in the context of this thread
     //
     // NB: this function will not be called if the thread is Kill()ed