fixed a clash in values for wxSlider styles

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 19a6fe2e1f295b6ed7c3c0c866b3bd6f9f71fb33..9cbc4735e5c15b7e65ebe8d1b1fc88201e3b5c34 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -52,7 +52,7 @@ class wxTCPClient;
 class wxTCPConnection: public wxConnectionBase
 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
-  
+
 protected:
   wxSocketBase *m_sock;
   wxSocketStream *m_sockstrm;
@@ -63,9 +63,9 @@ protected:
   friend class wxTCPServer;
   friend class wxTCPClient;
   friend void Client_OnRequest(wxSocketBase&,
-                              wxSocketBase::wxRequestEvent, char *);
+                              GSocketEvent, char *);
   friend void Server_OnRequest(wxSocketServer&,
-                              wxSocketBase::wxRequestEvent, char *);
+                              GSocketEvent, char *);
 public:
 
   wxTCPConnection(char *buffer, int size);
@@ -73,18 +73,18 @@ public:
   virtual ~wxTCPConnection();
 
   // Calls that CLIENT can make
-  bool Execute(char *data, int size = -1,
-               wxDataFormat format = wxDF_TEXT);
+  bool Execute(wxChar *data, int size = -1,
+               wxIPCFormat format = wxIPC_TEXT);
   char *Request(const wxString& item, int *size = NULL,
-                wxDataFormat format = wxDF_TEXT);
-  bool Poke(const wxString& item, char *data, int size = -1,
-            wxDataFormat format = wxDF_TEXT);
+                wxIPCFormat format = wxIPC_TEXT);
+  bool Poke(const wxString& item, wxChar *data, int size = -1,
+            wxIPCFormat format = wxIPC_TEXT);
   bool StartAdvise(const wxString& item);
   bool StopAdvise(const wxString& item);
 
   // Calls that SERVER can make
-  bool Advise(const wxString& item, char *data, int size = -1,
-              wxDataFormat format = wxDF_TEXT);
+  bool Advise(const wxString& item, wxChar *data, int size = -1,
+              wxIPCFormat format = wxIPC_TEXT);
 
   // Calls that both can make
   bool Disconnect();
@@ -94,6 +94,9 @@ public:
 
   // To enable the compressor
   void Compress(bool on);
+private:
+  // to prevent virtual function hiding warnings
+  virtual bool Execute(const wxString& str) { return(wxConnectionBase::Execute(str)); };
 };
 
 class wxTCPServer: public wxServerBase
@@ -105,9 +108,9 @@ public:
 
   wxTCPServer();
   virtual ~wxTCPServer();
-  
+
   // Returns FALSE if can't create server (e.g. port number is already in use)
-  virtual bool Create(const wxString& server_name); 
+  virtual bool Create(const wxString& server_name);
   virtual wxConnectionBase *OnAcceptConnection(const wxString& topic);
 };
 
@@ -115,7 +118,7 @@ class wxTCPClient: public wxClientBase
 {
   DECLARE_DYNAMIC_CLASS(wxTCPClient)
 
-public: 
+public:
   wxTCPClient();
   virtual ~wxTCPClient();
 
@@ -125,7 +128,7 @@ public:
   virtual wxConnectionBase *MakeConnection(const wxString& host,
                                            const wxString& server,
                                            const wxString& topic);
-  
+
   // Tailor this to return own connection.
   virtual wxConnectionBase *OnMakeConnection();
 };