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 fb4be23571792f180aa58f00fd477019023b277f..36e7bfbb87091560e3282a623d906893ffe7c598 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -24,7 +24,7 @@
 #endif
 
 /* Definition of GSocket */
 #endif
 
 /* Definition of GSocket */

-class GSocket
+class GSocket : public GSocketBase

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


@@ -47,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();


@@ -73,54 +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;
-  int m_initialRecvBufferSize;
-  int m_initialSendBufferSize;

 
 /* 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;
 };
 

-/* 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);
-

 #endif  /* _WX_MSW_GSOCKMSW_H_ */
 #endif  /* _WX_MSW_GSOCKMSW_H_ */