removed #pragma interface because it results in link problems when building wxBase...

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 743da0ab9f03e0f8268422f80b55a6ea651d3a99..dec0233480023c39b22eda4229a184cef4c3d894 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -10,13 +10,13 @@
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
 // Copyright:   (c) Julian Smart 1993
 //              (c) Guilhem Lavaux 1997, 1998
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "sckipc.h"
 #endif
 
 #pragma interface "sckipc.h"
 #endif
 


@@ -61,13 +61,13 @@ class WXDLLEXPORT wxTCPConnection: public wxConnectionBase
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 
 public:

-  wxTCPConnection(char *buffer, int size);
+  wxTCPConnection(wxChar *buffer, int size);

   wxTCPConnection();
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   wxTCPConnection();
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

-  virtual char *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
+  virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);

   virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);
   virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);


@@ -102,6 +102,8 @@ private:
   //
   virtual bool Execute(const wxString& str)
     { return Execute(str, -1, wxIPC_TEXT); }
   //
   virtual bool Execute(const wxString& str)
     { return Execute(str, -1, wxIPC_TEXT); }

+
+    DECLARE_NO_COPY_CLASS(wxTCPConnection)

 };
 
 class wxTCPServer: public wxServerBase
 };
 
 class wxTCPServer: public wxServerBase


@@ -122,6 +124,13 @@ public:
 
 protected:
   wxSocketServer *m_server;
 
 protected:
   wxSocketServer *m_server;

+
+#ifdef __UNIX_LIKE__
+  // the name of the file associated to the Unix domain socket, may be empty
+  wxString m_filename;
+#endif // __UNIX_LIKE__
+
+    DECLARE_NO_COPY_CLASS(wxTCPServer)

 };
 
 class wxTCPClient: public wxClientBase
 };
 
 class wxTCPClient: public wxClientBase