(blind) fix for gcc 3.4 warning for an always true comparison in an assert

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

diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f9f3885e1673fc3ba8472c4a7a32cbb92ec5bc8c..f03454c49afd159f3cd979dbff6a2f48146e0b4c 100644 (file)
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -6,7 +6,7 @@
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/17/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

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

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".


@@ -130,11 +130,9 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
     return 0;
 }
 

-extern wxChar wxPanelClassName[];
-

 long wxExecute(
   const wxString&                   rCommand
 long wxExecute(
   const wxString&                   rCommand

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
 , wxProcess*                        pHandler
 )
 {


@@ -150,12 +148,10 @@ long wxExecute(
     ULONG                           ulExecFlag;
     PSZ                             zArgs = NULL;
     PSZ                             zEnvs = NULL;
     ULONG                           ulExecFlag;
     PSZ                             zArgs = NULL;
     PSZ                             zEnvs = NULL;

-    ULONG                           ulWindowId;

     APIRET                          rc;
     APIRET                          rc;

-    PFNWP                           pOldProc;

     TID                             vTID;
 
     TID                             vTID;
 

-    if (bSync)
+    if (flags & wxEXEC_SYNC)

         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;
         ulExecFlag = EXEC_SYNC;
     else
         ulExecFlag = EXEC_ASYNCRESULT;


@@ -179,8 +175,8 @@ long wxExecute(
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;
 
     pData->vResultCodes = vResultCodes;
     pData->hWnd         = NULLHANDLE;

-    pData->bState       = bSync;
-    if (bSync)
+    pData->bState       = (flags & wxEXEC_SYNC) != 0;
+    if (flags & wxEXEC_SYNC)

     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;
     {
         wxASSERT_MSG(!pHandler, wxT("wxProcess param ignored for sync execution"));
         pData->pHandler = NULL;


@@ -205,7 +201,7 @@ long wxExecute(
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }
         // the process still started up successfully...
         return vResultCodes.codeTerminate;
     }

-    if (!bSync)
+    if (!(flags & wxEXEC_SYNC))

     {
         // return the pid
         // warning: don't exit your app unless you actively
     {
         // return the pid
         // warning: don't exit your app unless you actively


@@ -227,7 +223,7 @@ long wxExecute(
 
 long wxExecute(
   char**                            ppArgv
 
 long wxExecute(
   char**                            ppArgv

-, bool                              bSync
+, int                               flags

 , wxProcess*                        pHandler
 )
 {
 , wxProcess*                        pHandler
 )
 {


@@ -239,7 +235,7 @@ long wxExecute(
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand
     }
     sCommand.RemoveLast();
     return wxExecute( sCommand

-                     ,bSync
+                     ,flags

                      ,pHandler
                     );
 }
                      ,pHandler
                     );
 }