conversion warning gcc 3.3 mac

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 5ec21ae5741f746c497490253b71410ac9edd69e..af60bef9ac0c6f48025f5ab3f27a286cecb21761 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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
 
 #pragma implementation "ipcbase.h"
 #endif
 


@@ -30,4 +30,61 @@ IMPLEMENT_CLASS(wxServerBase, wxObject)
 IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
 IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 

+wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
+    : m_connected(TRUE),
+      m_buffer(buffer),
+      m_buffersize(size),
+      m_deletebufferwhendone(FALSE)
+{
+  if ( buffer == (wxChar *)NULL )
+  { // behave like next constructor
+    m_buffersize = 0;
+    m_deletebufferwhendone = TRUE;
+  }
+}
+
+wxConnectionBase::wxConnectionBase()
+    : m_connected(TRUE),
+      m_buffer(NULL),
+      m_buffersize(0),
+      m_deletebufferwhendone(TRUE)
+{
+}
+
+wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
+    : 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") );
+}
+
+
+wxConnectionBase::~wxConnectionBase(void)
+{
+  if ( m_deletebufferwhendone && m_buffer )
+   delete m_buffer;
+}
+
+wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
+{
+  if ( m_buffersize >= bytes )
+    return m_buffer;
+  else
+  {  // need to resize buffer
+    if ( m_deletebufferwhendone )
+    { // we're in charge of buffer, increase it
+      if ( m_buffer )
+        delete m_buffer;
+      m_buffer = new wxChar[bytes];
+      m_buffersize = bytes;
+      return m_buffer;
+    } // user-supplied buffer, fail
+    else
+      return NULL;
+  }
+}