Merge of SOC2010_RTC_IMAGES branch.

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

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 936eb13b5eda7f363dfd23241d6d58199a38bcd8..89a5bd00043f313f453ce1b90e6a133b851ce243 100644 (file)
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -139,6 +139,9 @@ public:
     virtual void OnExit() = 0;
 
 
     virtual void OnExit() = 0;
 
 

+    // create the socket implementation object matching this manager
+    virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket) = 0;
+

     // these functions enable or disable monitoring of the given socket for the
     // specified events inside the currently running event loop (but notice
     // that both BSD and Winsock implementations actually use socket->m_server
     // these functions enable or disable monitoring of the given socket for the
     // specified events inside the currently running event loop (but notice
     // that both BSD and Winsock implementations actually use socket->m_server


@@ -167,16 +170,12 @@ private:
     Base class for all socket implementations providing functionality common to
     BSD and Winsock sockets.
 
     Base class for all socket implementations providing functionality common to
     BSD and Winsock sockets.
 

-    Objects of this class are not created directly but only via its static
-    Create() method which is implemented in port-specific code.
+    Objects of this class are not created directly but only via the factory
+    function wxSocketManager::CreateSocket().

  */
 class wxSocketImpl
 {
 public:
  */
 class wxSocketImpl
 {
 public:

-    // static factory function: creates the low-level socket associated with
-    // the given wxSocket (and inherits its attributes such as timeout)
-    static wxSocketImpl *Create(wxSocketBase& wxsocket);
-

     virtual ~wxSocketImpl();
 
     // set various socket properties: all of those can only be called before
     virtual ~wxSocketImpl();
 
     // set various socket properties: all of those can only be called before