X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/022a8a5af2763ae462ac56fe6d1d7bd6d4fe71c8..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/common/ipcbase.cpp diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp index ee7e34278f..6f6c8c1629 100644 --- a/src/common/ipcbase.cpp +++ b/src/common/ipcbase.cpp @@ -21,9 +21,9 @@ #include "wx/ipcbase.h" -IMPLEMENT_CLASS(wxServerBase, wxObject) -IMPLEMENT_CLASS(wxClientBase, wxObject) -IMPLEMENT_CLASS(wxConnectionBase, wxObject) +wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject) +wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject) +wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject) wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes) : m_buffer((char *)buffer), @@ -55,14 +55,14 @@ wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy) { // copy constructor would require ref-counted pointer to buffer - wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") ); + wxFAIL_MSG( wxT("Copy constructor of wxConnectionBase not implemented") ); } 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(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(data), size); break; case wxIPC_UTF8TEXT: if ( size ) size--; - s = wxString::FromUTF8(wx_static_cast(const char *, data), size); + s = wxString::FromUTF8(static_cast(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;