make wxTmemchr() return (and take) char* instead of void* in ANSI build too

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index ab06fb943ea433f39769e030ae904598e6717bfb..e4b4064a760b9eb9dab8e8643cd1151ff6a67456 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -16,10 +16,6 @@
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 

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

 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS && wxUSE_IPC
 #include "wx/defs.h"
 
 #if wxUSE_SOCKETS && wxUSE_IPC


@@ -53,8 +49,8 @@
  *
  */
 
  *
  */
 

-class WXDLLIMPEXP_NET wxTCPServer;
-class WXDLLIMPEXP_NET wxTCPClient;
+class WXDLLIMPEXP_FWD_NET wxTCPServer;
+class WXDLLIMPEXP_FWD_NET wxTCPClient;

 
 class WXDLLIMPEXP_NET wxTCPConnection: public wxConnectionBase
 {
 
 class WXDLLIMPEXP_NET wxTCPConnection: public wxConnectionBase
 {


@@ -68,12 +64,12 @@ public:
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);
   virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT);
   // Calls that CLIENT can make
   virtual bool Execute(const wxChar *data, int size = -1, 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 Poke(const wxString& item, const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT);

   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);
 
   // Calls that SERVER can make
   virtual bool StartAdvise(const wxString& item);
   virtual bool StopAdvise(const wxString& item);
 
   // Calls that SERVER can make

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

 
   // Calls that both can make
   virtual bool Disconnect(void);
 
   // Calls that both can make
   virtual bool Disconnect(void);


@@ -85,6 +81,12 @@ public:
   // To enable the compressor (NOTE: not implemented!)
   void Compress(bool on);
 
   // To enable the compressor (NOTE: not implemented!)
   void Compress(bool on);
 

+  // unhide the Execute overload from wxConnectionBase
+  // FIXME-UTF8: change Execute() to DoExecute() to avoid having to do this;
+  //             don't use c_str() below after removing ANSI build
+  virtual bool Execute(const wxString& str)
+    { return Execute(str.c_str(), -1, wxIPC_TEXT); }
+

 protected:
   wxSocketBase       *m_sock;
   wxSocketStream     *m_sockstrm;
 protected:
   wxSocketBase       *m_sock;
   wxSocketStream     *m_sockstrm;


@@ -96,20 +98,11 @@ protected:
   friend class wxTCPClient;
   friend class wxTCPEventHandler;
 
   friend class wxTCPClient;
   friend class wxTCPEventHandler;
 

-private:
-  //
-  // We're hiding an Execute method in ConnectionBase
-  //
-  virtual bool Execute(const wxString& str)
-    { return Execute(str, -1, wxIPC_TEXT); }
-
-    DECLARE_NO_COPY_CLASS(wxTCPConnection)
+  DECLARE_NO_COPY_CLASS(wxTCPConnection)

 };
 
 class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase
 {
 };
 
 class WXDLLIMPEXP_NET wxTCPServer: public wxServerBase
 {

-  DECLARE_DYNAMIC_CLASS(wxTCPServer)
-

 public:
   wxTCPConnection *topLevelConnection;
 
 public:
   wxTCPConnection *topLevelConnection;
 


@@ -130,13 +123,12 @@ protected:
   wxString m_filename;
 #endif // __UNIX_LIKE__
 
   wxString m_filename;
 #endif // __UNIX_LIKE__
 

-    DECLARE_NO_COPY_CLASS(wxTCPServer)
+  DECLARE_NO_COPY_CLASS(wxTCPServer)
+  DECLARE_DYNAMIC_CLASS(wxTCPServer)

 };
 
 class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase
 {
 };
 
 class WXDLLIMPEXP_NET wxTCPClient: public wxClientBase
 {

-  DECLARE_DYNAMIC_CLASS(wxTCPClient)
-

 public:
   wxTCPClient();
   virtual ~wxTCPClient();
 public:
   wxTCPClient();
   virtual ~wxTCPClient();


@@ -150,6 +142,9 @@ public:
 
   // Callbacks to CLIENT - override at will
   virtual wxConnectionBase *OnMakeConnection();
 
   // Callbacks to CLIENT - override at will
   virtual wxConnectionBase *OnMakeConnection();

+
+private:
+  DECLARE_DYNAMIC_CLASS(wxTCPClient)

 };
 
 #endif // wxUSE_SOCKETS && wxUSE_IPC
 };
 
 #endif // wxUSE_SOCKETS && wxUSE_IPC