Removing warnings

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 354bce5f7e890e4ca26b0db253d84db0d4edebbf..f4531f16f8cd6ac70231b89c8e09ac2b8a46be5a 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -42,8 +42,8 @@ enum wxIPCFormat
   wxIPC_PRIVATE =          20
 };
 
   wxIPC_PRIVATE =          20
 };
 

-class WXDLLEXPORT wxDDEServerBase;
-class WXDLLEXPORT wxDDEClientBase;
+class WXDLLEXPORT wxServerBase;
+class WXDLLEXPORT wxClientBase;

 
 class WXDLLEXPORT wxConnectionBase: public wxObject
 {
 
 class WXDLLEXPORT wxConnectionBase: public wxObject
 {

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index 87d414217cd3f7f04d788526394328905b169ab4..939283e94040a8f6af7c118e00e02228579f203d 100644 (file)
--- a/include/wx/sckipc.h
+++ b/include/wx/sckipc.h
@@ -11,11 +11,12 @@
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 //              (c) 2000 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

+

 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifdef __GNUG__
 #ifndef _WX_SCKIPC_H
 #define _WX_SCKIPC_H
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "sckipc.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -49,27 +50,13 @@
  *
  */
 
  *
  */
 

-class wxTCPServer;
-class wxTCPClient;
-class wxTCPConnection: public wxConnectionBase
+class WXDLLEXPORT wxTCPServer;
+class WXDLLEXPORT wxTCPClient;
+
+class WXDLLEXPORT wxTCPConnection: public wxConnectionBase

 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)
 {
   DECLARE_DYNAMIC_CLASS(wxTCPConnection)

-
-protected:
-  wxSocketBase *m_sock;
-  wxSocketStream *m_sockstrm;
-  wxDataInputStream *m_codeci;
-  wxDataOutputStream *m_codeco;
-  wxString m_topic;
-
-  friend class wxTCPServer;
-  friend class wxTCPClient;
-  friend void Client_OnRequest(wxSocketBase&,
-                               wxSocketNotify, char *);
-  friend void Server_OnRequest(wxSocketServer&,
-                               wxSocketNotify, char *);

 public:
 public:

-

   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();
   virtual ~wxTCPConnection();
   wxTCPConnection(char *buffer, int size);
   wxTCPConnection();
   virtual ~wxTCPConnection();


@@ -89,14 +76,20 @@ public:
   virtual bool Disconnect(void);
 
   // Callbacks to SERVER - override at will
   virtual bool Disconnect(void);
 
   // Callbacks to SERVER - override at will

-  virtual bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format) { return FALSE; };
-  virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format) { return NULL; };
-  virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) { return FALSE; };
-  virtual bool OnStartAdvise(const wxString& topic, const wxString& item) { return FALSE; };
-  virtual bool OnStopAdvise(const wxString& topic, const wxString& item) { return FALSE; };
+  virtual bool OnExecute(const wxString& topic, char *data, int size, wxIPCFormat format)
+    { return wxConnectionBase::OnExecute(topic, data, size, format); };
+  virtual char *OnRequest(const wxString& topic, const wxString& item, int *size, wxIPCFormat format)
+    { return wxConnectionBase::OnRequest(topic, item, size, format); };
+  virtual bool OnPoke(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
+    { return wxConnectionBase::OnPoke(topic, item, data, size, format); };
+  virtual bool OnStartAdvise(const wxString& topic, const wxString& item)
+    { return wxConnectionBase::OnStartAdvise(topic, item); };
+  virtual bool OnStopAdvise(const wxString& topic, const wxString& item)
+    { return wxConnectionBase::OnStopAdvise(topic, item); };

 
   // Callbacks to CLIENT - override at will
 
   // Callbacks to CLIENT - override at will

-  virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format) { return FALSE; };
+  virtual bool OnAdvise(const wxString& topic, const wxString& item, char *data, int size, wxIPCFormat format)
+    { return wxConnectionBase::OnAdvise(topic, item, data, size, format); };

 
   // Callbacks to BOTH
 
 
   // Callbacks to BOTH
 


@@ -106,6 +99,20 @@ public:
   // To enable the compressor
   void Compress(bool on);
 
   // To enable the compressor
   void Compress(bool on);
 

+protected:
+  wxSocketBase *m_sock;
+  wxSocketStream *m_sockstrm;
+  wxDataInputStream *m_codeci;
+  wxDataOutputStream *m_codeco;
+  wxString m_topic;
+
+  friend class wxTCPServer;
+  friend class wxTCPClient;
+  friend void Client_OnRequest(wxSocketBase&,
+                               wxSocketNotify, char *);
+  friend void Server_OnRequest(wxSocketServer&,
+                               wxSocketNotify, char *);
+

 private:
 };
 
 private:
 };
 

diff --git a/src/common/sckipc.cpp b/src/common/sckipc.cpp
index 488ea062ba00b11b8fa7a67e0abcdebcebbe595c..80fe44212d91ce7b161a5934f7b8895406a54e59 100644 (file)
--- a/src/common/sckipc.cpp
+++ b/src/common/sckipc.cpp
@@ -23,11 +23,12 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if wxUSE_SOCKETS
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+#include "wx/defs.h"

 #endif
 
 #endif
 

+#if wxUSE_SOCKETS 
+

 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 


@@ -41,7 +42,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
 
 IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
 IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)

-IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
+IMPLEMENT_CLASS(wxTCPConnection, wxConnectionBase)

 
 // It seems to be already defined somewhere in the Xt includes.
 #ifndef __XT__
 
 // It seems to be already defined somewhere in the Xt includes.
 #ifndef __XT__


@@ -62,11 +63,11 @@ enum {
 #endif
 
 void Server_OnRequest(wxSocketServer& server,
 #endif
 
 void Server_OnRequest(wxSocketServer& server,

-                     wxSocketNotify evt,
-                     char *cdata);
+                      wxSocketNotify evt,
+                      char *cdata);

 void Client_OnRequest(wxSocketBase& sock,
 void Client_OnRequest(wxSocketBase& sock,

-                     wxSocketNotify evt,
-                     char *cdata);
+                      wxSocketNotify evt,
+                      char *cdata);

 
 // ---------------------------------------------------------------------------
 // wxTCPClient
 
 // ---------------------------------------------------------------------------
 // wxTCPClient