activating ustring again

[wxWidgets.git] / include / wx / msw / gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 90cc323e0f93566256a5dc4a54382f61769a7e7f..fb4be23571792f180aa58f00fd477019023b277f 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -1,39 +1,27 @@
 /* -------------------------------------------------------------------------
- * 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$
  * -------------------------------------------------------------------------
  */
 
-#ifndef __GSOCK_MSW_H
-#define __GSOCK_MSW_H
+#ifndef _WX_MSW_GSOCKMSW_H_
+#define _WX_MSW_GSOCKMSW_H_
 
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
-#endif
-
-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+#include "wx/msw/wrapwin.h"
 
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/gsocket.h"
-#else
-#include "gsocket.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 "wx/msw/wrapwin.h"
-
-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);
-};
+#if defined(__WXWINCE__) || defined(__CYGWIN__)
+#include <winsock.h>
+#endif
 
 /* Definition of GSocket */
 class GSocket
@@ -50,7 +38,11 @@ public:
   GAddress *GetPeer();
   GSocketError SetServer();
   GSocket *WaitConnection();
+  // not used under MSW
+  void Notify(bool) { }
   bool SetReusable();
+  bool SetBroadcast();
+  bool DontDoBind();
   GSocketError Connect(GSocketStream stream);
   GSocketError SetNonOriented();
   int Read(char *buffer, int size);
@@ -66,6 +58,13 @@ public:
     void *optval, int *optlen);
   GSocketError SetSockOpt(int level, int optname,
     const void *optval, int optlen);
+
+  void SetInitialSocketBuffers(int recv, int send)
+  {
+      m_initialRecvBufferSize = recv;
+      m_initialSendBufferSize = send;
+  }
+
 protected:
   GSocketError Input_Timeout();
   GSocketError Output_Timeout();
@@ -75,6 +74,8 @@ protected:
   int Send_Stream(const char *buffer, int size);
   int Send_Dgram(const char *buffer, int size);
   bool m_ok;
+  int m_initialRecvBufferSize;
+  int m_initialSendBufferSize;
 
 /* TODO: Make these protected */
 public:
@@ -89,6 +90,8 @@ public:
   bool m_stream;
   bool m_establishing;
   bool m_reusable;
+  bool m_broadcast;
+  bool m_dobind;
   struct timeval m_timeout;
 
   /* Callbacks */
@@ -98,10 +101,6 @@ public:
   int m_msgnumber;
 };
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Definition of GAddress */
 struct _GAddress
 {
@@ -124,10 +123,4 @@ GSocketError _GAddress_translate_to  (GAddress *address,
 GSocketError _GAddress_Init_INET(GAddress *address);
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
-
-#endif  /* __GSOCK_MSW_H */
+#endif  /* _WX_MSW_GSOCKMSW_H_ */