Added default ctor

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 605e15c5b6a4d6ff13128ac700027a0bbbacaa91..ee5df5f03ed55b02ee32e5da168cb786cfc24102 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -12,7 +12,7 @@
 #ifndef _WX_NETWORK_SOCKET_H
 #define _WX_NETWORK_SOCKET_H
 
 #ifndef _WX_NETWORK_SOCKET_H
 #define _WX_NETWORK_SOCKET_H
 

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

   #pragma interface "socket.h"
 #endif
 
   #pragma interface "socket.h"
 #endif
 


@@ -33,6 +33,7 @@
 
 #include "wx/sckaddr.h"
 #include "wx/gsocket.h"
 
 #include "wx/sckaddr.h"
 #include "wx/gsocket.h"

+#include "wx/list.h"

 
 // ------------------------------------------------------------------------
 // Types and constants
 
 // ------------------------------------------------------------------------
 // Types and constants


@@ -94,43 +95,15 @@ enum wxSocketType
 typedef int wxSocketFlags;
 
 
 typedef int wxSocketFlags;
 
 

-#if WXWIN_COMPATIBILITY
-  typedef wxSocketType wxSockType;
-  typedef wxSocketFlags wxSockFlags;
-#endif // WXWIN_COMPATIBILITY
-

 
 // --------------------------------------------------------------------------
 // wxSocketBase
 // --------------------------------------------------------------------------
 
 
 // --------------------------------------------------------------------------
 // wxSocketBase
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSocketBase : public wxObject
+class WXDLLIMPEXP_NET wxSocketBase : public wxObject

 {
   DECLARE_CLASS(wxSocketBase)
 
 {
   DECLARE_CLASS(wxSocketBase)
 

-public:
-
-#if WXWIN_COMPATIBILITY
-  enum
-  {
-    NONE = wxSOCKET_NONE,
-    NOWAIT = wxSOCKET_NOWAIT,
-    WAITALL = wxSOCKET_WAITALL,
-    SPEED = wxSOCKET_BLOCK
-  };
-
-  enum
-  {
-    SOCK_UNINIT = wxSOCKET_UNINIT,
-    SOCK_CLIENT = wxSOCKET_CLIENT,
-    SOCK_SERVER = wxSOCKET_SERVER,
-    SOCK_INTERNAL = wxSOCKET_BASE,
-    SOCK_DATAGRAM = wxSOCKET_DATAGRAM
-  };
-
-  typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
-#endif // WXWIN_COMPATIBILITY
-

 public:
 
   // Public interface
 public:
 
   // Public interface


@@ -190,12 +163,6 @@ public:
   static bool Initialize();
   static void Shutdown();
 
   static bool Initialize();
   static void Shutdown();
 

-  // callbacks are deprecated, use events instead
-#if WXWIN_COMPATIBILITY
-  wxSockCbk Callback(wxSockCbk cbk_);
-  char *CallbackData(char *data);
-#endif // WXWIN_COMPATIBILITY
-

 
   // Implementation from now on
   // --------------------------
 
   // Implementation from now on
   // --------------------------


@@ -255,11 +222,7 @@ private:
   // the initialization count, GSocket is initialized if > 0
   static size_t m_countInit;
 
   // the initialization count, GSocket is initialized if > 0
   static size_t m_countInit;
 

-  // callbacks are deprecated, use events instead
-#if WXWIN_COMPATIBILITY
-  wxSockCbk     m_cbk;              // callback
-  char         *m_cdata;            // callback data
-#endif // WXWIN_COMPATIBILITY
+    DECLARE_NO_COPY_CLASS(wxSocketBase)

 };
 
 
 };
 
 


@@ -267,7 +230,7 @@ private:
 // wxSocketServer
 // --------------------------------------------------------------------------
 
 // wxSocketServer
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSocketServer : public wxSocketBase
+class WXDLLIMPEXP_NET wxSocketServer : public wxSocketBase

 {
   DECLARE_CLASS(wxSocketServer)
 
 {
   DECLARE_CLASS(wxSocketServer)
 


@@ -278,6 +241,8 @@ public:
   bool AcceptWith(wxSocketBase& socket, bool wait = TRUE);
 
   bool WaitForAccept(long seconds = -1, long milliseconds = 0);
   bool AcceptWith(wxSocketBase& socket, bool wait = TRUE);
 
   bool WaitForAccept(long seconds = -1, long milliseconds = 0);

+
+  DECLARE_NO_COPY_CLASS(wxSocketServer)

 };
 
 
 };
 
 


@@ -285,7 +250,7 @@ public:
 // wxSocketClient
 // --------------------------------------------------------------------------
 
 // wxSocketClient
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSocketClient : public wxSocketBase
+class WXDLLIMPEXP_NET wxSocketClient : public wxSocketBase

 {
   DECLARE_CLASS(wxSocketClient)
 
 {
   DECLARE_CLASS(wxSocketClient)
 


@@ -296,6 +261,8 @@ public:
   virtual bool Connect(wxSockAddress& addr, bool wait = TRUE);
 
   bool WaitOnConnect(long seconds = -1, long milliseconds = 0);
   virtual bool Connect(wxSockAddress& addr, bool wait = TRUE);
 
   bool WaitOnConnect(long seconds = -1, long milliseconds = 0);

+
+  DECLARE_NO_COPY_CLASS(wxSocketClient)

 };
 
 
 };
 
 


@@ -305,7 +272,7 @@ public:
 
 // WARNING: still in alpha stage
 
 
 // WARNING: still in alpha stage
 

-class WXDLLEXPORT wxDatagramSocket : public wxSocketBase
+class WXDLLIMPEXP_NET wxDatagramSocket : public wxSocketBase

 {
   DECLARE_CLASS(wxDatagramSocket)
 
 {
   DECLARE_CLASS(wxDatagramSocket)
 


@@ -322,6 +289,7 @@ public:
 /* TODO:
   bool Connect(wxSockAddress& addr);
 */
 /* TODO:
   bool Connect(wxSockAddress& addr);
 */

+  DECLARE_NO_COPY_CLASS(wxDatagramSocket)

 };
 
 
 };
 
 


@@ -329,7 +297,7 @@ public:
 // wxSocketEvent
 // --------------------------------------------------------------------------
 
 // wxSocketEvent
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxSocketEvent : public wxEvent
+class WXDLLIMPEXP_NET wxSocketEvent : public wxEvent

 {
 public:
   wxSocketEvent(int id = 0)
 {
 public:
   wxSocketEvent(int id = 0)


@@ -341,19 +309,13 @@ public:
   wxSocketBase   *GetSocket() const      { return (wxSocketBase *) GetEventObject(); }
   void           *GetClientData() const  { return m_clientData; }
 
   wxSocketBase   *GetSocket() const      { return (wxSocketBase *) GetEventObject(); }
   void           *GetClientData() const  { return m_clientData; }
 

-  // backwards compatibility
-#if WXWIN_COMPATIBILITY_2
-  wxSocketNotify  SocketEvent() const    { return m_event; }
-  wxSocketBase   *Socket() const         { return (wxSocketBase *) GetEventObject(); }
-#endif // WXWIN_COMPATIBILITY_2
-

   virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
 
 public:
   wxSocketNotify  m_event;
   void           *m_clientData;
 
   virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }
 
 public:
   wxSocketNotify  m_event;
   void           *m_clientData;
 

-  DECLARE_DYNAMIC_CLASS(wxSocketEvent)
+  DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSocketEvent)

 };
 
 
 };