DC reorganization

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index af60bef9ac0c6f48025f5ab3f27a286cecb21761..0de6f3b045204f938ad5675f830f09502a3d1d57 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -1,27 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        ipcbase.cpp
+// Name:        src/common/ipcbase.cpp
 // Purpose:     IPC base classes
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "ipcbase.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/defs.h"
 #endif
 
 #include "wx/ipcbase.h"
@@ -30,32 +25,33 @@ IMPLEMENT_CLASS(wxServerBase, 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)
+wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
+    : m_buffer((char *)buffer),
+      m_buffersize(bytes),
+      m_deletebufferwhendone(false),
+      m_connected(true)
 {
-  if ( buffer == (wxChar *)NULL )
+  if ( buffer == NULL )
   { // behave like next constructor
     m_buffersize = 0;
-    m_deletebufferwhendone = TRUE;
+    m_deletebufferwhendone = true;
   }
 }
 
 wxConnectionBase::wxConnectionBase()
-    : m_connected(TRUE),
-      m_buffer(NULL),
+    : m_buffer(NULL),
       m_buffersize(0),
-      m_deletebufferwhendone(TRUE)
+      m_deletebufferwhendone(true),
+      m_connected(true)
 {
 }
 
-wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
-    : m_connected(copy.m_connected),
+wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
+    : wxObject(),
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
-      m_deletebufferwhendone(FALSE)
+      m_deletebufferwhendone(false),
+      m_connected(copy.m_connected)
 
 {
   // copy constructor would require ref-counted pointer to buffer
@@ -66,10 +62,10 @@ wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
 wxConnectionBase::~wxConnectionBase(void)
 {
   if ( m_deletebufferwhendone && m_buffer )
-   delete m_buffer;
+    delete m_buffer;
 }
 
-wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
+void *wxConnectionBase::GetBufferAtLeast( size_t bytes )
 {
   if ( m_buffersize >= bytes )
     return m_buffer;
@@ -79,7 +75,7 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
     { // we're in charge of buffer, increase it
       if ( m_buffer )
         delete m_buffer;
-      m_buffer = new wxChar[bytes];
+      m_buffer = new char[bytes];
       m_buffersize = bytes;
       return m_buffer;
     } // user-supplied buffer, fail
@@ -87,4 +83,3 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
       return NULL;
   }
 }
-