Compile with builtin ODBC in GTK+ ANSI mode

[wxWidgets.git] / include / wx / unix / gsockunx.h

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 1ae5b4248d0c57b76befaaec6c789c93f56576f6..cf04be6a65076bd248bc6886ee0dfb43f0f4cea1 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -5,42 +5,107 @@
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */

+

 #ifndef __GSOCK_UNX_H
 #define __GSOCK_UNX_H
 
 #ifndef __GSOCK_UNX_H
 #define __GSOCK_UNX_H
 

+#ifndef __GSOCKET_STANDALONE__

 #include "wx/setup.h"
 #include "wx/setup.h"

+#endif

 
 

-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)

 
 

+#ifndef __GSOCKET_STANDALONE__

 #include "wx/gsocket.h"
 #include "wx/gsocket.h"

+#else
+#include "gsocket.h"
+#endif

 
 

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+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 Install_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+    virtual void Enable_Events(GSocket *socket);
+    virtual void Disable_Events(GSocket *socket);
+};

 
 

-/* Definition of GSocket */
-struct _GSocket {
+class GSocket
+{
+public:
+    GSocket();
+    virtual ~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 millisec);
+    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);
+    virtual void Detected_Read();
+    virtual void Detected_Write();
+protected:
+    void Enable(GSocketEvent event);
+    void Disable(GSocketEvent event);
+    GSocketError Input_Timeout();
+    GSocketError Output_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;
+public:
+    /* DFE: We can't protect these data member until the GUI code is updated */
+    /* protected: */

   int m_fd;
   int m_fd;

-  GAddress *m_local, *m_peer;
+  GAddress *m_local;
+  GAddress *m_peer;

   GSocketError m_error;
 
   GSocketError m_error;
 

-  bool m_non_blocking, m_server, m_stream, m_oriented;
+  bool m_non_blocking;
+  bool m_server;
+  bool m_stream;

   bool m_establishing;
   bool m_establishing;

+  bool m_reusable;

   unsigned long m_timeout;
 
   /* Callbacks */
   unsigned long m_timeout;
 
   /* Callbacks */

+  GSocketEventFlags m_detected;

   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
 
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
 

-  /* IO calls associated */
-  bool m_iocalls[GSOCK_MAX_EVENT];
-

   char *m_gui_dependent;
   char *m_gui_dependent;

+

 };
 
 };
 

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

 /* Definition of GAddress */
 /* Definition of GAddress */

-struct _GAddress {
+struct _GAddress
+{

   struct sockaddr *m_addr;
   size_t m_len;
 
   struct sockaddr *m_addr;
   size_t m_len;
 


@@ -49,40 +114,30 @@ struct _GAddress {
 
   GSocketError m_error;
 };
 
   GSocketError m_error;
 };

+#ifdef __cplusplus
+}
+#endif  /* __cplusplus */

 
 

-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-void _GSocket_Configure_Callbacks(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);
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent count);
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent count);
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);
-void _GSocket_GUI_Init(GSocket *socket);
-void _GSocket_GUI_Destroy(GSocket *socket);
-
-/* Translaters returns false when memory is exhausted */
-GSocketError _GAddress_translate_from(GAddress *address,
-                                      struct sockaddr *addr, int len);
-GSocketError _GAddress_translate_to(GAddress *address,
-                                    struct sockaddr **addr, int *len);

 
 

-/* Initialisers returns FALSE when an error happened in the initialisation */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

 
 

-/* Internet address family */
+/* 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_INET(GAddress *address);

-/* Local address family */

 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 

+

 #ifdef __cplusplus
 }
 #ifdef __cplusplus
 }

-#endif /* __cplusplus */
+#endif  /* __cplusplus */

 
 

-#endif
-    /* wxUSE_SOCKETS */
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */

 
 

-#endif
-    /* __GSOCK_UNX_H */
+#endif  /* __GSOCK_UNX_H */