Minor header cleaning.

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 9d7c3dab2940cbd1a16260a50b8c355de7fe1c94..151b3004d1a3b4e6c48ef59a66f06a1d62eafbd1 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$
 // Purpose:     IPC base classes
 // Author:      Julian Smart
 // 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__
-#pragma implementation "ipcbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"

 #endif
 
 #include "wx/ipcbase.h"
 #endif
 
 #include "wx/ipcbase.h"


@@ -30,9 +25,11 @@ 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_buffer(buffer), m_buffersize(size),
-    m_deletebufferwhendone(false), m_connected(true)
+wxConnectionBase::wxConnectionBase(wxChar *buffer, int bytes)
+    : m_connected(true),
+      m_buffer(buffer),
+      m_buffersize(bytes),
+      m_deletebufferwhendone(false)

 {
   if ( buffer == (wxChar *)NULL )
   { // behave like next constructor
 {
   if ( buffer == (wxChar *)NULL )
   { // behave like next constructor


@@ -42,14 +39,20 @@ wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
 }
 
 wxConnectionBase::wxConnectionBase()
 }
 
 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)
+wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
+    : wxObject(),
+      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") );
 {
   // copy constructor would require ref-counted pointer to buffer
   wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") );


@@ -70,9 +73,12 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it

-      if ( !m_buffer )
+      if ( m_buffer )

         delete m_buffer;
         delete m_buffer;

-      m_buffer = new wxChar[bytes];
+      // the argument specifies **byte size**, but m_buffer is of type
+      // wxChar. Under unicode: sizeof(wxChar) > 1, so the buffer size is
+      // bytes / sizeof(wxChar) rounded upwards.
+      m_buffer = new wxChar[(bytes + sizeof(wxChar) - 1) / sizeof(wxChar)];

       m_buffersize = bytes;
       return m_buffer;
     } // user-supplied buffer, fail
       m_buffersize = bytes;
       return m_buffer;
     } // user-supplied buffer, fail


@@ -80,4 +86,3 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
       return NULL;
   }
 }
       return NULL;
   }
 }

-