Backed-out PNG8 patch (no time to look at why

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 4dcec53bde5bb06ccef8b037593a0af3886ae2f2..8899b5e0f128fdff2701f2b61c49e3551e9f00fa 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -124,7 +124,7 @@ public:
     DWORD      dwProcessId;   // pid of the process
     wxProcess *handler;
     DWORD      dwExitCode;    // the exit code of the process
-    bool       state;         // set to FALSE when the process finishes
+    bool       state;         // set to false when the process finishes
 };
 
 class wxExecuteModule : public wxModule
@@ -160,10 +160,10 @@ public:
     wxPipeInputStream(HANDLE hInput);
     virtual ~wxPipeInputStream();
 
-    // returns TRUE if the pipe is still opened
+    // returns true if the pipe is still opened
     bool IsOpened() const { return m_hInput != INVALID_HANDLE_VALUE; }
 
-    // returns TRUE if there is any data to be read from the pipe
+    // returns true if there is any data to be read from the pipe
     virtual bool CanRead() const;
 
 protected:
@@ -179,7 +179,8 @@ class wxPipeOutputStream: public wxOutputStream
 {
 public:
     wxPipeOutputStream(HANDLE hOutput);
-    virtual ~wxPipeOutputStream();
+    virtual ~wxPipeOutputStream() { Close(); }
+    bool Close();
 
 protected:
     size_t OnSysWrite(const void *buffer, size_t len);
@@ -211,7 +212,7 @@ public:
     // default ctor doesn't do anything
     wxPipe() { m_handles[Read] = m_handles[Write] = INVALID_HANDLE_VALUE; }
 
-    // create the pipe, return TRUE if ok, FALSE on error
+    // create the pipe, return true if ok, false on error
     bool Create()
     {
         // default secutiry attributes
@@ -225,13 +226,13 @@ public:
         {
             wxLogSysError(_("Failed to create an anonymous pipe"));
 
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
-    // return TRUE if we were created successfully
+    // return true if we were created successfully
     bool IsOk() const { return m_handles[Read] != INVALID_HANDLE_VALUE; }
 
     // return the descriptor for one of the pipe ends
@@ -362,7 +363,7 @@ wxPipeInputStream::~wxPipeInputStream()
 bool wxPipeInputStream::CanRead() const
 {
     if ( !IsOpened() )
-        return FALSE;
+        return false;
 
     DWORD nAvailable;
 
@@ -444,11 +445,12 @@ wxPipeOutputStream::wxPipeOutputStream(HANDLE hOutput)
     }
 }
 
-wxPipeOutputStream::~wxPipeOutputStream()
+bool wxPipeOutputStream::Close()
 {
-    ::CloseHandle(m_hOutput);
+   return ::CloseHandle(m_hOutput) != 0;
 }
 
+
 size_t wxPipeOutputStream::OnSysWrite(const void *buffer, size_t len)
 {
     m_lasterror = wxSTREAM_NO_ERROR;
@@ -497,7 +499,7 @@ static bool wxExecuteDDE(const wxString& ddeServer,
                                                    ddeTopic);
     if ( !conn )
     {
-        ok = FALSE;
+        ok = false;
     }
     else // connected to DDE server
     {
@@ -529,7 +531,7 @@ static bool wxExecuteDDE(const wxString& ddeServer,
 
 long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
 {
-    wxCHECK_MSG( !!cmd, 0, wxT("empty command in wxExecute") );
+    wxCHECK_MSG( !cmd.IsEmpty(), 0, wxT("empty command in wxExecute") );
 
 #if wxUSE_THREADS
     // for many reasons, the code below breaks down if it's called from another
@@ -862,7 +864,7 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
             case WAIT_TIMEOUT:
                 wxLogDebug(_T("Timeout too small in WaitForInputIdle"));
 
-                ok = FALSE;
+                ok = false;
                 break;
 
             case 0: