compilation fix

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 3db9fa141966b2373fa02c2d3b643fbb242228de..17eac58b1912a0d5aa58d20ac63ee768ef0e80fd 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWindows dev team
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998-2002 wxWindows dev team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -60,7 +60,9 @@
 #endif
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)
 #endif
 
 #if defined(__WIN32__) && !defined(__WXMICROWIN__)

-#include <io.h>
+#ifndef __UNIX__
+    #include <io.h>
+#endif

 
 #ifndef __GNUWIN32__
 #include <shellapi.h>
 
 #ifndef __GNUWIN32__
 #include <shellapi.h>


@@ -490,6 +492,14 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 
 {
     wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
 

+#if wxUSE_THREADS
+    // for many reasons, the code below breaks down if it's called from another
+    // thread -- this could be fixed, but as Unix versions don't support this
+    // neither I don't want to waste time on this now
+    wxASSERT_MSG( wxThread::IsMain(),
+                    _T("wxExecute() can be called only from the main thread") );
+#endif // wxUSE_THREADS
+

     wxString command;
 
 #if wxUSE_IPC
     wxString command;
 
 #if wxUSE_IPC