use correct fallback file name in SaveFile() (patch 820884)

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 9d7c3dab2940cbd1a16260a50b8c355de7fe1c94..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
 


@@ -31,25 +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_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
     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_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)
 {
 }
 
 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") );
 {
   // 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
   {  // 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;