Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index a8a9ff7c021ad67cdec304cd36320342c0d667f1..df328666653d39842e4b142fc1935c50b79e8797 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
 

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

   #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


@@ -185,6 +186,11 @@ public:
   void SetNotify(wxSocketEventFlags flags);
   void Notify(bool notify);
 
   void SetNotify(wxSocketEventFlags flags);
   void Notify(bool notify);
 

+  // initialize/shutdown the sockets (usually called automatically)
+  static bool IsInitialized();
+  static bool Initialize();
+  static void Shutdown();
+

   // callbacks are deprecated, use events instead
 #if WXWIN_COMPATIBILITY
   wxSockCbk Callback(wxSockCbk cbk_);
   // callbacks are deprecated, use events instead
 #if WXWIN_COMPATIBILITY
   wxSockCbk Callback(wxSockCbk cbk_);


@@ -247,11 +253,16 @@ private:
   bool          m_notify;           // notify events to users?
   wxSocketEventFlags  m_eventmask;  // which events to notify?
 
   bool          m_notify;           // notify events to users?
   wxSocketEventFlags  m_eventmask;  // which events to notify?
 

+  // 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
   // 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)

 };
 
 
 };
 
 


@@ -270,6 +281,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)

 };
 
 
 };
 
 


@@ -288,6 +301,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)

 };
 
 
 };
 
 


@@ -297,7 +312,7 @@ public:
 
 // WARNING: still in alpha stage
 
 
 // WARNING: still in alpha stage
 

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

 {
   DECLARE_CLASS(wxDatagramSocket)
 
 {
   DECLARE_CLASS(wxDatagramSocket)
 


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

+  DECLARE_NO_COPY_CLASS(wxDatagramSocket)

 };
 
 
 };
 
 


@@ -323,10 +339,11 @@ public:
 
 class WXDLLEXPORT wxSocketEvent : public wxEvent
 {
 
 class WXDLLEXPORT wxSocketEvent : public wxEvent
 {

-  DECLARE_DYNAMIC_CLASS(wxSocketEvent)
-

 public:
 public:

-  wxSocketEvent(int id = 0);
+  wxSocketEvent(int id = 0)
+      : wxEvent(id, wxEVT_SOCKET)
+      {
+      }

 
   wxSocketNotify  GetSocketEvent() const { return m_event; }
   wxSocketBase   *GetSocket() const      { return (wxSocketBase *) GetEventObject(); }
 
   wxSocketNotify  GetSocketEvent() const { return m_event; }
   wxSocketBase   *GetSocket() const      { return (wxSocketBase *) GetEventObject(); }


@@ -338,19 +355,24 @@ public:
   wxSocketBase   *Socket() const         { return (wxSocketBase *) GetEventObject(); }
 #endif // WXWIN_COMPATIBILITY_2
 
   wxSocketBase   *Socket() const         { return (wxSocketBase *) GetEventObject(); }
 #endif // WXWIN_COMPATIBILITY_2
 

-  void CopyObject(wxObject& object_dest) const;
+  virtual wxEvent *Clone() const { return new wxSocketEvent(*this); }

 
 public:
   wxSocketNotify  m_event;
   void           *m_clientData;
 
 public:
   wxSocketNotify  m_event;
   void           *m_clientData;

+
+  DECLARE_DYNAMIC_CLASS(wxSocketEvent)

 };
 
 
 typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 
 };
 
 
 typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 

-#define EVT_SOCKET(id, func) wxEventTableEntry( wxEVT_SOCKET, id, -1, \
-  (wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func, \
-  (wxObject *) NULL ),
+#define EVT_SOCKET(id, func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SOCKET, id, -1, \
+                              (wxObjectEventFunction) \
+                              (wxEventFunction) \
+                              (wxSocketEventFunction) & func, \
+                              (wxObject *) NULL ),

 
 
 #endif
 
 
 #endif