winundef.h serves for other compilators too with STL turned on.

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

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 6c3befccb5064917f053cb7fe46f2ea324b0251f..346a23c4c1335be8b84b483f1dcacaba493de408 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -21,16 +21,67 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

-#include <winsock.h>
+#include "wx/msw/wrapwin.h"

 
 

-#ifdef __cplusplus
-extern "C" {
+#if defined(__WXWINCE__)
+#include <winsock.h>

 #endif
 
 #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 */

-typedef
-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;
   SOCKET m_fd;
   GAddress *m_local;
   GAddress *m_peer;


@@ -40,7 +91,8 @@ struct _GSocket
   bool m_non_blocking;
   bool m_server;
   bool m_stream;
   bool m_non_blocking;
   bool m_server;
   bool m_stream;

-  bool m_oriented;
+  bool m_establishing;
+  bool m_reusable;

   struct timeval m_timeout;
 
   /* Callbacks */
   struct timeval m_timeout;
 
   /* Callbacks */


@@ -50,6 +102,10 @@ struct _GSocket
   int m_msgnumber;
 };
 
   int m_msgnumber;
 };
 

+#ifdef __cplusplus
+extern "C" {
+#endif
+

 /* Definition of GAddress */
 struct _GAddress
 {
 /* Definition of GAddress */
 struct _GAddress
 {


@@ -63,29 +119,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);
 /* 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);
 
 GSocketError _GAddress_Init_INET(GAddress *address);
 GSocketError _GAddress_Init_UNIX(GAddress *address);