fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 0e2d15ae9111a7e5493ea7ff8ff5f4e983bf4789..78e3e6351a47f1ed4400fb709f882ccc759756c6 100644 (file)
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -51,7 +51,7 @@
    having been defined in sys/types.h" when winsock.h is included later and
    doesn't seem to be necessary anyhow. It's not needed under Mac neither.
  */
    having been defined in sys/types.h" when winsock.h is included later and
    doesn't seem to be necessary anyhow. It's not needed under Mac neither.
  */

-#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__)
+#if !defined(__WXMAC__) && !defined(__WXMSW__) && !defined(__WXWINCE__)

 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>
 #endif
 


@@ -61,7 +61,7 @@
 
 // include the header defining timeval: under Windows this struct is used only
 // with sockets so we need to include winsock.h which we do via windows.h
 
 // include the header defining timeval: under Windows this struct is used only
 // with sockets so we need to include winsock.h which we do via windows.h

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     #include "wx/msw/wrapwin.h"
 #else
     #include <sys/time.h>   // for timeval
     #include "wx/msw/wrapwin.h"
 #else
     #include <sys/time.h>   // for timeval


@@ -79,7 +79,7 @@
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

     #define SOCKET int
 #endif
 
     #define SOCKET int
 #endif
 


@@ -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


@@ -365,10 +364,10 @@ private:
     // socket is shut down
     wxSocketBase *m_wxsocket;
 
     // socket is shut down
     wxSocketBase *m_wxsocket;
 

-    DECLARE_NO_COPY_CLASS(wxSocketImpl)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImpl);

 };
 
 };
 

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     #include "wx/msw/private/sockmsw.h"
 #else
     #include "wx/unix/private/sockunix.h"
     #include "wx/msw/private/sockmsw.h"
 #else
     #include "wx/unix/private/sockunix.h"