X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c9eff305505d6e3a63026c542004d518d997d2a..613de0e89efab1cbf8463ea06e0cf0b2914fbce9:/include/wx/msw/gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index d51271fc3f..fe5d5a2942 100644
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -1,113 +1,72 @@
-/* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockmsw.h
- * Purpose: GSocket MSW header
- * CVSID:   $Id$
- * -------------------------------------------------------------------------
- */
-
-#ifndef __GSOCK_MSW_H
-#define __GSOCK_MSW_H
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:       wx/msw/gsockmsw.h
+// Purpose:    MSW-specific socket implementation
+// Authors:    Guilhem Lavaux, Guillermo Rodriguez Garcia, Vadim Zeitlin
+// Created:    April 1997
+// Copyright:  (C) 1999-1997, Guilhem Lavaux
+//             (C) 1999-2000, Guillermo Rodriguez Garcia
+//             (C) 2008 Vadim Zeitlin
+// RCS_ID:     $Id$
+// License:    wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+#ifndef _WX_MSW_GSOCKMSW_H_
+#define _WX_MSW_GSOCKMSW_H_
+
+#include "wx/msw/wrapwin.h"
+
+#if defined(__CYGWIN__)
+    //CYGWIN gives annoying warning about runtime stuff if we don't do this
+#   define USE_SYS_TYPES_FD_SET
+#   include <sys/types.h>
 #endif
 
-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/gsocket.h"
-#else
-#include "gsocket.h"
+#if defined(__WXWINCE__) || defined(__CYGWIN__)
+    #include <winsock.h>
 #endif
 
-#include <windows.h>
-#include <winsock.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined(__cplusplus)
-typedef int bool;
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
+// ----------------------------------------------------------------------------
+// MSW-specific socket implementation
+// ----------------------------------------------------------------------------
 
-/* Definition of GSocket */
-struct _GSocket
+class wxSocketImplMSW : public wxSocketImpl
 {
-  SOCKET m_fd;
-  GAddress *m_local;
-  GAddress *m_peer;
-  GSocketError m_error;
-
-  /* Attributes */
-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
-  bool m_establishing;
-  struct timeval m_timeout;
-
-  /* Callbacks */
-  GSocketEventFlags m_detected;
-  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
-  char *m_data[GSOCK_MAX_EVENT];
-  int m_msgnumber;
-};
-
-/* Definition of GAddress */
-struct _GAddress
-{
-  struct sockaddr *m_addr;
-  size_t m_len;
-
-  GAddressType m_family;
-  int m_realfamily;
+public:
+    wxSocketImplMSW(wxSocketBase& wxsocket);
 
-  GSocketError m_error;
-};
-
-/* Input / output */
+    virtual ~wxSocketImplMSW();
 
-GSocketError _GSocket_Input_Timeout(GSocket *socket);
-GSocketError _GSocket_Output_Timeout(GSocket *socket);
-GSocketError _GSocket_Connect_Timeout(GSocket *socket);
-int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size);
-int _GSocket_Recv_Dgram(GSocket *socket, char *buffer, int size);
-int _GSocket_Send_Stream(GSocket *socket, const char *buffer, int size);
-int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
+    virtual wxSocketImpl *WaitConnection(wxSocketBase& wxsocket);
 
-/* Callbacks */
 
-bool _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);
+    int Read(char *buffer, int size);
+    int Write(const char *buffer, int size);
 
-LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
+private:
+    virtual wxSocketError DoHandleConnect(int ret);
+    virtual void DoClose();
 
-void _GSocket_Enable_Events(GSocket *socket);
-void _GSocket_Disable_Events(GSocket *socket);
+    virtual void UnblockAndRegisterWithEventLoop()
+    {
+        // no need to make the socket non-blocking, Install_Callback() will do
+        // it
+        wxSocketManager::Get()->Install_Callback(this);
+    }
 
-/* GAddress */
+    wxSocketError Input_Timeout();
+    wxSocketError Output_Timeout();
+    wxSocketError Connect_Timeout();
+    int Recv_Stream(char *buffer, int size);
+    int Recv_Dgram(char *buffer, int size);
+    int Send_Stream(const char *buffer, int size);
+    int Send_Dgram(const char *buffer, int size);
 
-GSocketError _GAddress_translate_from(GAddress *address,
-                                      struct sockaddr *addr, int len);
-GSocketError _GAddress_translate_to  (GAddress *address,
-                                      struct sockaddr **addr, int *len);
-GSocketError _GAddress_Init_INET(GAddress *address);
-GSocketError _GAddress_Init_UNIX(GAddress *address);
+    int m_msgnumber;
 
-#ifdef __cplusplus
-}
-#endif
+    friend class wxSocketMSWManager;
 
-#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+    DECLARE_NO_COPY_CLASS(wxSocketImplMSW)
+};
 
-#endif  /* __GSOCK_MSW_H */
+#endif  /* _WX_MSW_GSOCKMSW_H_ */