Finished review of the first 1,000 lines of grid.h interface header.

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

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index a32589d602dae7c943de2f46149f048b91df9326..36e7bfbb87091560e3282a623d906893ffe7c598 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -8,20 +8,8 @@
  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 

-#ifndef __GSOCK_MSW_H
-#define __GSOCK_MSW_H
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/setup.h"
-#endif
-
-#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
-
-#ifndef __GSOCKET_STANDALONE__
-#include "wx/gsocket.h"
-#else
-#include "gsocket.h"
-#endif
+#ifndef _WX_MSW_GSOCKMSW_H_
+#define _WX_MSW_GSOCKMSW_H_

 
 #include "wx/msw/wrapwin.h"
 
 
 #include "wx/msw/wrapwin.h"
 


@@ -35,20 +23,8 @@
 #include <winsock.h>
 #endif
 
 #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 */
 /* Definition of GSocket */

-class GSocket
+class GSocket : public GSocketBase

 {
 public:
   GSocket();
 {
 public:
   GSocket();


@@ -62,6 +38,8 @@ public:
   GAddress *GetPeer();
   GSocketError SetServer();
   GSocket *WaitConnection();
   GAddress *GetPeer();
   GSocketError SetServer();
   GSocket *WaitConnection();

+  // not used under MSW
+  void Notify(bool) { }

   bool SetReusable();
   bool SetBroadcast();
   bool DontDoBind();
   bool SetReusable();
   bool SetBroadcast();
   bool DontDoBind();


@@ -69,7 +47,6 @@ public:
   GSocketError SetNonOriented();
   int Read(char *buffer, int size);
   int Write(const char *buffer, int size);
   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 SetNonBlocking(bool non_block);
   void SetTimeout(unsigned long millis);
   GSocketError WXDLLIMPEXP_NET GetError();


@@ -80,6 +57,13 @@ public:
     void *optval, int *optlen);
   GSocketError SetSockOpt(int level, int optname,
     const void *optval, int optlen);
     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();
 protected:
   GSocketError Input_Timeout();
   GSocketError Output_Timeout();


@@ -88,62 +72,11 @@ protected:
   int Recv_Dgram(char *buffer, int size);
   int Send_Stream(const char *buffer, int size);
   int Send_Dgram(const 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:
 
 /* TODO: Make these protected */
 public:

-  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_establishing;
-  bool m_reusable;
-  bool m_broadcast;
-  bool m_dobind;
-  struct timeval m_timeout;

 
 

-  /* Callbacks */
-  GSocketEventFlags m_detected;
-  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
-  char *m_data[GSOCK_MAX_EVENT];

   int m_msgnumber;
 };
 
   int m_msgnumber;
 };
 

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Definition of GAddress */
-struct _GAddress
-{
-  struct sockaddr *m_addr;
-  size_t m_len;
-
-  GAddressType m_family;
-  int m_realfamily;
-
-  GSocketError m_error;
-};
-
-
-/* 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_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_ */