allow specifying the mask colour in wxImage::ConvertAlphaToMask() (closes #10143)

[wxWidgets.git] / src / common / ipcbase.cpp

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index ee7e34278f476aa8ade3961f13d5afce635bc042..64c6c1f76005b2f30df1ba6fc0348695ec7d1df8 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -62,7 +62,7 @@ wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
 wxConnectionBase::~wxConnectionBase()
 {
   if ( m_deletebufferwhendone )
-    delete m_buffer;
+    delete [] m_buffer;
 }
 
 /* static */
@@ -80,7 +80,7 @@ wxString wxConnectionBase::GetTextFromData(const void* data,
             if ( size )
                 size--;
 
-            s = wxString(wx_static_cast(const char *, data), size);
+            s = wxString(static_cast<const char *>(data), size);
             break;
 
 #if wxUSE_UNICODE
@@ -94,14 +94,14 @@ wxString wxConnectionBase::GetTextFromData(const void* data,
                 size--;
             }
 
-            s = wxString(wx_static_cast(const wchar_t *, data), size);
+            s = wxString(static_cast<const wchar_t *>(data), size);
             break;
 
         case wxIPC_UTF8TEXT:
             if ( size )
                 size--;
 
-            s = wxString::FromUTF8(wx_static_cast(const char *, data), size);
+            s = wxString::FromUTF8(static_cast<const char *>(data), size);
             break;
 #endif // wxUSE_UNICODE
 
@@ -120,8 +120,7 @@ void *wxConnectionBase::GetBufferAtLeast( size_t bytes )
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it
-      if ( m_buffer )
-        delete m_buffer;
+      delete [] m_buffer;
       m_buffer = new char[bytes];
       m_buffersize = bytes;
       return m_buffer;