X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f010ad481266d9267f5f4fd0547a9fc891441715..8c94336825149d5f329eaea77ba32ae5b5fd3a31:/include/wx/ipcbase.h

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 61a0c283d8..cfc442eb97 100644
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -5,17 +5,13 @@
 // Modified by:
 // Created:     4/1/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_IPCBASEH__
 #define _WX_IPCBASEH__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "ipcbase.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
@@ -42,17 +38,17 @@ enum wxIPCFormat
   wxIPC_PRIVATE =          20
 };
 
-class WXDLLEXPORT wxServerBase;
-class WXDLLEXPORT wxClientBase;
+class WXDLLIMPEXP_BASE wxServerBase;
+class WXDLLIMPEXP_BASE wxClientBase;
 
-class WXDLLEXPORT wxConnectionBase: public wxObject
+class WXDLLIMPEXP_BASE wxConnectionBase: public wxObject
 {
   DECLARE_CLASS(wxConnectionBase)
 
 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; }
@@ -61,7 +57,7 @@ public:
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT ) = 0;
   virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); }
-  virtual char *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0;
+  virtual wxChar *Request(const wxString& item, int *size = (int *) NULL, wxIPCFormat format = wxIPC_TEXT) = 0;
   virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT) = 0;
   virtual bool StartAdvise(const wxString& item) = 0;
   virtual bool StopAdvise(const wxString& item) = 0;
@@ -74,42 +70,42 @@ public:
 
   // Callbacks to SERVER - override at will
   virtual bool OnExecute     ( const wxString& WXUNUSED(topic),
-                               char *WXUNUSED(data),
+                               wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return FALSE; };
+                             { return false; };
 
-  virtual char *OnRequest    ( const wxString& WXUNUSED(topic),
+  virtual wxChar *OnRequest    ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
                                int *WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return (char *) NULL; };
+                             { return (wxChar *) NULL; };
 
   virtual bool OnPoke        ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
                                wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return FALSE; };
+                             { return false; };
 
   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) )
-                             { return FALSE; };
+                             { return false; };
 
   // Callbacks to CLIENT - override at will
   virtual bool OnAdvise      ( const wxString& WXUNUSED(topic),
                                const wxString& WXUNUSED(item),
-                               char *WXUNUSED(data),
+                               wxChar *WXUNUSED(data),
                                int WXUNUSED(size),
                                wxIPCFormat WXUNUSED(format) )
-                             { return FALSE; };
+                             { return false; };
 
   // 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
@@ -122,31 +118,35 @@ private:
   wxChar *      m_buffer;
   size_t        m_buffersize;
   bool          m_deletebufferwhendone;
+
+  // can't use DECLARE_NO_COPY_CLASS(wxConnectionBase) because we already
+  // have copy ctor but still forbid the default assignment operator
+  wxConnectionBase& operator=(const wxConnectionBase&);
 };
 
 
-class WXDLLEXPORT wxServerBase: public wxObject
+class WXDLLIMPEXP_BASE wxServerBase: public wxObject
 {
   DECLARE_CLASS(wxServerBase)
 
 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 wxConnectionBase *OnAcceptConnection(const wxString& topic) = 0;
 };
 
-class WXDLLEXPORT wxClientBase: public wxObject
+class WXDLLIMPEXP_BASE wxClientBase: public wxObject
 {
   DECLARE_CLASS(wxClientBase)
 
 public:
-  inline wxClientBase(void) {};
-  inline ~wxClientBase(void) {};
+  inline wxClientBase(void) {}
+  inline ~wxClientBase(void) {}
 
   virtual bool ValidHost(const wxString& host) = 0;