X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/44379ce6fa20294cf83e5f65cc2006b1ea8be6c1..564c92d95b0c73256fd2be165986204bb213359d:/src/common/ipcbase.cpp diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp index 9d7c3dab29..902e7b8a30 100644 --- a/src/common/ipcbase.cpp +++ b/src/common/ipcbase.cpp @@ -5,11 +5,11 @@ // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "ipcbase.h" #endif @@ -31,8 +31,10 @@ IMPLEMENT_CLASS(wxClientBase, wxObject) IMPLEMENT_CLASS(wxConnectionBase, wxObject) wxConnectionBase::wxConnectionBase(wxChar *buffer, int size) - : m_buffer(buffer), m_buffersize(size), - m_deletebufferwhendone(false), m_connected(true) + : m_connected(true), + m_buffer(buffer), + m_buffersize(size), + m_deletebufferwhendone(false) { if ( buffer == (wxChar *)NULL ) { // behave like next constructor @@ -42,14 +44,19 @@ wxConnectionBase::wxConnectionBase(wxChar *buffer, int size) } wxConnectionBase::wxConnectionBase() - : m_buffersize(0), m_buffer(NULL), m_deletebufferwhendone(true), - m_connected(true) + : m_connected(true), + m_buffer(NULL), + m_buffersize(0), + m_deletebufferwhendone(true) { } wxConnectionBase::wxConnectionBase(wxConnectionBase& copy) - : m_buffer(copy.m_buffer), m_buffersize(copy.m_buffersize), - m_deletebufferwhendone(false), m_connected(copy.m_connected) + : m_connected(copy.m_connected), + m_buffer(copy.m_buffer), + m_buffersize(copy.m_buffersize), + m_deletebufferwhendone(false) + { // copy constructor would require ref-counted pointer to buffer wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") ); @@ -70,7 +77,7 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes ) { // need to resize buffer if ( m_deletebufferwhendone ) { // we're in charge of buffer, increase it - if ( !m_buffer ) + if ( m_buffer ) delete m_buffer; m_buffer = new wxChar[bytes]; m_buffersize = bytes;