Applied patch [ 599043 ] fix for wxTreeCtrl/MSW right-click prob

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 69ee8c8c46f937dce3450584b7e8be944336f2b5..e550fca890a1276545555fb6dcb8c5a5a7505a1f 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -341,6 +341,10 @@ wxPipeInputStream::~wxPipeInputStream()
 
 bool wxPipeInputStream::IsAvailable() const
 {
+    // FIXME
+#ifdef __WXWINE__
+    return FALSE;
+#else
     if ( !IsOpened() )
         return FALSE;
 
@@ -374,6 +378,7 @@ bool wxPipeInputStream::IsAvailable() const
     }
 
     return nAvailable != 0;
+#endif
 }
 
 size_t wxPipeInputStream::OnSysRead(void *buffer, size_t len)
@@ -892,16 +897,18 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 #endif // Win16/32
 }
 
-long wxExecute(char **argv, int flags, wxProcess *handler)
+long wxExecute(wxChar **argv, int flags, wxProcess *handler)
 {
     wxString command;
 
-    while ( *argv != NULL )
+    for ( ;; )
     {
-        command << *argv++ << ' ';
-    }
+        command += *argv++;
+        if ( !*argv )
+            break;
 
-    command.RemoveLast();
+        command += _T(' ');
+    }
 
     return wxExecute(command, flags, handler);
 }