X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c09f28798bb9e9e8f8cd563b7b9dd24f0acc6ebd..f36b3a915e4543fbbd9c911724404b016972aabc:/include/wx/msw/gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index ba6a2848d5..859ed60513 100644
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -1,8 +1,10 @@
 /* -------------------------------------------------------------------------
- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockmsw.h
- * Purpose: GSocket MSW header
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockmsw.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket MSW header
+ * CVSID:       $Id$
  * -------------------------------------------------------------------------
  */
 
@@ -21,18 +23,73 @@
 #include "gsocket.h"
 #endif
 
-#if defined(__BORLANDC__)
-#include <windows.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
-#include <winsock.h>
 
-#ifdef __cplusplus
-extern "C" {
+#if defined(__WXWINCE__) || defined(__CYGWIN__)
+#include <winsock.h>
 #endif
 
+class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
+{
+public:
+    virtual bool OnInit();
+    virtual void OnExit();
+    virtual bool CanUseEventLoop();
+    virtual bool Init_Socket(GSocket *socket);
+    virtual void Destroy_Socket(GSocket *socket);
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};
+
 /* Definition of GSocket */
-struct _GSocket
+class GSocket
 {
+public:
+  GSocket();
+  ~GSocket();
+  bool IsOk() { return m_ok; }
+  void Close();
+  void Shutdown();
+  GSocketError SetLocal(GAddress *address);
+  GSocketError SetPeer(GAddress *address);
+  GAddress *GetLocal();
+  GAddress *GetPeer();
+  GSocketError SetServer();
+  GSocket *WaitConnection();
+  bool SetReusable();
+  GSocketError Connect(GSocketStream stream);
+  GSocketError SetNonOriented();
+  int Read(char *buffer, int size);
+  int Write(const char *buffer, int size);
+  GSocketEventFlags Select(GSocketEventFlags flags);
+  void SetNonBlocking(bool non_block);
+  void SetTimeout(unsigned long millis);
+  GSocketError WXDLLIMPEXP_NET GetError();
+  void SetCallback(GSocketEventFlags flags,
+    GSocketCallback callback, char *cdata);
+  void UnsetCallback(GSocketEventFlags flags);
+  GSocketError GetSockOpt(int level, int optname,
+    void *optval, int *optlen);
+  GSocketError SetSockOpt(int level, int optname,
+    const void *optval, int optlen);
+protected:
+  GSocketError Input_Timeout();
+  GSocketError Output_Timeout();
+  GSocketError 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);
+  bool m_ok;
+
+/* TODO: Make these protected */
+public:
   SOCKET m_fd;
   GAddress *m_local;
   GAddress *m_peer;
@@ -42,7 +99,8 @@ struct _GSocket
   bool m_non_blocking;
   bool m_server;
   bool m_stream;
-  bool m_oriented;
+  bool m_establishing;
+  bool m_reusable;
   struct timeval m_timeout;
 
   /* Callbacks */
@@ -52,6 +110,10 @@ struct _GSocket
   int m_msgnumber;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Definition of GAddress */
 struct _GAddress
 {
@@ -65,29 +127,12 @@ struct _GAddress
 };
 
 
-/* Input / output */
-
-GSocketError _GSocket_Input_Timeout(GSocket *socket);
-GSocketError _GSocket_Output_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);
-
-/* Callbacks */
-
-void _GSocket_Enable_Events(GSocket *socket);
-void _GSocket_Disable_Events(GSocket *socket);
-LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
-
 /* GAddress */
 
 GSocketError _GAddress_translate_from(GAddress *address,
                                       struct sockaddr *addr, int len);
-
-GSocketError _GAddress_translate_to(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);