adding CoreText

[wxWidgets.git] / src / msw / utilsexc.cpp

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index e9f7ae28b532195bb51cea206ef1757066870c97..9c959de05ed4231c672ab89a6c4f8ea036943bc9 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -82,6 +82,15 @@
 
 #include "wx/msw/private/hiddenwin.h"
 
 
 #include "wx/msw/private/hiddenwin.h"
 

+// FIXME-VC6: These are not defined in VC6 SDK headers.
+#ifndef BELOW_NORMAL_PRIORITY_CLASS
+    #define BELOW_NORMAL_PRIORITY_CLASS 0x4000
+#endif
+
+#ifndef ABOVE_NORMAL_PRIORITY_CLASS
+    #define ABOVE_NORMAL_PRIORITY_CLASS 0x8000
+#endif
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -853,23 +862,26 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler,
     }
 
     // Translate wxWidgets priority to Windows conventions.
     }
 
     // Translate wxWidgets priority to Windows conventions.

-    unsigned prio = handler->GetPriority();
-    if ( prio <= 20 )
-        dwFlags |= IDLE_PRIORITY_CLASS;
-    else if ( prio <= 40 )
-        dwFlags |= BELOW_NORMAL_PRIORITY_CLASS;
-    else if ( prio <= 60 )
-        dwFlags |= NORMAL_PRIORITY_CLASS;
-    else if ( prio <= 80 )
-        dwFlags |= ABOVE_NORMAL_PRIORITY_CLASS;
-    else if ( prio <= 99 )
-        dwFlags |= HIGH_PRIORITY_CLASS;
-    else if ( prio <= 100 )
-        dwFlags |= REALTIME_PRIORITY_CLASS;
-    else
+    if ( handler )

     {
     {

-        wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
-        dwFlags |= THREAD_PRIORITY_NORMAL;
+        unsigned prio = handler->GetPriority();
+        if ( prio <= 20 )
+            dwFlags |= IDLE_PRIORITY_CLASS;
+        else if ( prio <= 40 )
+            dwFlags |= BELOW_NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 60 )
+            dwFlags |= NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 80 )
+            dwFlags |= ABOVE_NORMAL_PRIORITY_CLASS;
+        else if ( prio <= 99 )
+            dwFlags |= HIGH_PRIORITY_CLASS;
+        else if ( prio <= 100 )
+            dwFlags |= REALTIME_PRIORITY_CLASS;
+        else
+        {
+            wxFAIL_MSG(wxT("invalid value of thread priority parameter"));
+            dwFlags |= NORMAL_PRIORITY_CLASS;
+        }

     }
 
     bool ok = ::CreateProcess
     }
 
     bool ok = ::CreateProcess