make cocoa mediactrl usable. Some touchups to carbon mediactrl code. Add notebook...

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 52a762c25235e58acd99898e44cbba5ce34fba48..759727e1b59ad72c02c939397633ff93eeb64d91 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
 


@@ -31,31 +31,32 @@ IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
 wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
 wxConnectionBase::wxConnectionBase(wxChar *buffer, int size)

-    : m_connected(TRUE),
+    : m_connected(true),

       m_buffer(buffer),
       m_buffersize(size),
       m_buffer(buffer),
       m_buffersize(size),

-      m_deletebufferwhendone(FALSE)
+      m_deletebufferwhendone(false)

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

-    m_deletebufferwhendone = TRUE;
+    m_deletebufferwhendone = true;

   }
 }
 
 wxConnectionBase::wxConnectionBase()
   }
 }
 
 wxConnectionBase::wxConnectionBase()

-    : m_connected(TRUE),
+    : m_connected(true),

       m_buffer(NULL),
       m_buffersize(0),
       m_buffer(NULL),
       m_buffersize(0),

-      m_deletebufferwhendone(TRUE)
+      m_deletebufferwhendone(true)

 {
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)
 {
 }
 
 wxConnectionBase::wxConnectionBase(wxConnectionBase& copy)

-    : m_connected(copy.m_connected),
+    : wxObject(),
+      m_connected(copy.m_connected),

       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),

-      m_deletebufferwhendone(FALSE)
+      m_deletebufferwhendone(false)

 
 {
   // copy constructor would require ref-counted pointer to buffer
 
 {
   // copy constructor would require ref-counted pointer to buffer


@@ -77,7 +78,7 @@ 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;
       m_buffer = new wxChar[bytes];
       m_buffersize = bytes;
         delete m_buffer;
       m_buffer = new wxChar[bytes];
       m_buffersize = bytes;