moving rounded rect and ellipse to path class

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

diff --git a/include/wx/sckipc.h b/include/wx/sckipc.h
index ab06fb943ea433f39769e030ae904598e6717bfb..70ea564b785600af57c78dd77de6d74d65a03fb6 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


@@ -85,6 +81,10 @@ 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
+  virtual bool Execute(const wxString& str)
+    { return Execute(str, -1, wxIPC_TEXT); }
+

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


@@ -96,20 +96,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 +121,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 +140,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