fix the tests to pass with both gcc and msvc (2nd part of patch 1462778)

[wxWidgets.git] / include / wx / ipcbase.h

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 61969b4de3b1bef7a383df78d3b0f4f965457363..cfc442eb978d07b6902eb7f3c9988a3f50184def 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -12,10 +12,6 @@
 #ifndef _WX_IPCBASEH__
 #define _WX_IPCBASEH__
 
 #ifndef _WX_IPCBASEH__
 #define _WX_IPCBASEH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "ipcbase.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -52,7 +48,7 @@ class WXDLLIMPEXP_BASE wxConnectionBase: public wxObject
 public:
   wxConnectionBase(wxChar *buffer, int size); // use external buffer
   wxConnectionBase(); // use internal, adaptive buffer
 public:
   wxConnectionBase(wxChar *buffer, int size); // use external buffer
   wxConnectionBase(); // use internal, adaptive buffer

-  wxConnectionBase(wxConnectionBase& copy);
+  wxConnectionBase(const wxConnectionBase& copy);

   ~wxConnectionBase(void);
 
   void SetConnected( bool c ) { m_connected = c; }
   ~wxConnectionBase(void);
 
   void SetConnected( bool c ) { m_connected = c; }


@@ -77,7 +73,7 @@ public:
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )

-                             { return FALSE; };
+                             { return false; };

 
   virtual wxChar *OnRequest    ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
 
   virtual wxChar *OnRequest    ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),


@@ -90,15 +86,15 @@ public:
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )

-                             { return FALSE; };
+                             { return false; };

 
   virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )
 
   virtual bool OnStartAdvise ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )

-                             { return FALSE; };
+                             { return false; };

 
   virtual bool OnStopAdvise  ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )
 
   virtual bool OnStopAdvise  ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item) )

-                             { return FALSE; };
+                             { return false; };

 
   // Callbacks to CLIENT - override at will
   virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),
 
   // Callbacks to CLIENT - override at will
   virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),


@@ -106,10 +102,10 @@ public:
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )

-                             { return FALSE; };
+                             { return false; };

 
   // Callbacks to BOTH - override at will
 
   // Callbacks to BOTH - override at will

-  // Default behaviour is to delete connection and return TRUE
+  // Default behaviour is to delete connection and return true

   virtual bool OnDisconnect(void) = 0;
 
   // return a buffer at least this size, reallocating buffer if needed
   virtual bool OnDisconnect(void) = 0;
 
   // return a buffer at least this size, reallocating buffer if needed


@@ -135,9 +131,9 @@ class WXDLLIMPEXP_BASE wxServerBase: public wxObject
 
 public:
   inline wxServerBase(void) {}
 
 public:
   inline wxServerBase(void) {}

-  inline ~wxServerBase(void) {};
+  inline ~wxServerBase(void) {}

 
 

-  // Returns FALSE on error (e.g. port number is already in use)
+  // Returns false on error (e.g. port number is already in use)

   virtual bool Create(const wxString& serverName) = 0;
 
   // Callbacks to SERVER - override at will
   virtual bool Create(const wxString& serverName) = 0;
 
   // Callbacks to SERVER - override at will


@@ -149,8 +145,8 @@ class WXDLLIMPEXP_BASE wxClientBase: public wxObject
   DECLARE_CLASS(wxClientBase)
 
 public:
   DECLARE_CLASS(wxClientBase)
 
 public:

-  inline wxClientBase(void) {};
-  inline ~wxClientBase(void) {};
+  inline wxClientBase(void) {}
+  inline ~wxClientBase(void) {}

 
   virtual bool ValidHost(const wxString& host) = 0;
 
 
   virtual bool ValidHost(const wxString& host) = 0;