Missed include due to wxBookCtrlSizer existence.

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

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index fd96f7d08e5fbfeecb952125f8f54e89487bedb2..cf04be6a65076bd248bc6886ee0dfb43f0f4cea1 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -21,20 +21,25 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#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 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);
+};

 
 

-#ifdef wxUSE_GSOCKET_CPLUSPLUS
-class GSocketBSD
+class GSocket

 {
 public:
 {
 public:

-    GSocketBSD();
-    virtual ~GSocketBSD();
+    GSocket();
+    virtual ~GSocket();

     bool IsOk() { return m_ok; }
     void Close();
     void Shutdown();
     bool IsOk() { return m_ok; }
     void Close();
     void Shutdown();


@@ -44,20 +49,23 @@ public:
     GAddress *GetPeer();
     GSocketError SetServer();
     GSocket *WaitConnection();
     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);
     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(int non_block);
+    void SetNonBlocking(bool non_block);

     void SetTimeout(unsigned long millisec);
     void SetTimeout(unsigned long millisec);

-    GSocketError GetError();
+    GSocketError WXDLLIMPEXP_NET GetError();

     void SetCallback(GSocketEventFlags flags,
         GSocketCallback callback, char *cdata);
     void UnsetCallback(GSocketEventFlags flags);
     void SetCallback(GSocketEventFlags flags,
         GSocketCallback callback, char *cdata);
     void UnsetCallback(GSocketEventFlags flags);

-    /* API compatibility functions */
-    static void _GSocket_Detected_Read(GSocket *socket);
-    static void _GSocket_Detected_Write(GSocket *socket);
+    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);
 protected:
     void Enable(GSocketEvent event);
     void Disable(GSocketEvent event);


@@ -67,36 +75,20 @@ 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);

-    void Detected_Read();
-    void Detected_Write();

     bool m_ok;
     bool m_ok;

-    virtual void EventLoop_Enable_Events() = 0;
-    virtual void EventLoop_Disable_Events() = 0;
-    virtual void EventLoop_Install_Callback(GSocketEvent event) = 0;
-    virtual void EventLoop_Uninstall_Callback(GSocketEvent event) = 0;

 public:
     /* DFE: We can't protect these data member until the GUI code is updated */
     /* protected: */
 public:
     /* DFE: We can't protect these data member until the GUI code is updated */
     /* protected: */

-#else /* def wxUSE_GSOCKET_CPLUSPLUS */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-/* Definition of GSocket */
-struct _GSocket
-{
-#endif /* def wxUSE_GSOCKET_CPLUSPLUS */

   int m_fd;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
 
   int m_fd;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
 

-  int m_non_blocking;
-  int m_server;
-  int m_stream;
-  int m_oriented;
-  int m_establishing;
-  int m_reusable;
+  bool m_non_blocking;
+  bool m_server;
+  bool m_stream;
+  bool m_establishing;
+  bool m_reusable;

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


@@ -106,38 +98,7 @@ struct _GSocket
 
   char *m_gui_dependent;
 
 
   char *m_gui_dependent;
 

-  /* Function pointers */
-  struct GSocketBaseFunctionsTable *m_functions;

 };
 };

-#ifndef wxUSE_GSOCKET_CPLUSPLUS
-#ifdef __cplusplus
-}
-#endif  /* __cplusplus */
-#else
-/**************************************************************************/
-/* GSocketBSDGUIShim */
-class GSocketBSDGUIShim:public GSocketBSD
-{
-    friend void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *guifunc);
-public:
-    static inline bool GUI_Init();
-    static inline void GUI_Cleanup();
-    static inline bool UseGUI();
-    GSocketBSDGUIShim();
-    virtual ~GSocketBSDGUIShim();
-protected:
-    virtual void EventLoop_Enable_Events();
-    virtual void EventLoop_Disable_Events();
-    virtual void EventLoop_Install_Callback(GSocketEvent event);
-    virtual void EventLoop_Uninstall_Callback(GSocketEvent event);
-private:
-/* Table of GUI-related functions. We must call them indirectly because
- * of wxBase and GUI separation: */
-
-    static struct GSocketGUIFunctionsTable *ms_gui_functions;
-};
-
-#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -157,77 +118,11 @@ struct _GAddress
 }
 #endif  /* __cplusplus */
 
 }
 #endif  /* __cplusplus */
 

-/* Compatibility methods to support old C API (from gsocket.h) */
-#ifdef wxUSE_GSOCKET_CPLUSPLUS
-inline void GSocket_Shutdown(GSocket *socket)
-{   socket->Shutdown(); }
-inline GSocketError GSocket_SetLocal(GSocket *socket, GAddress *address)
-{   return socket->SetLocal(address); }
-inline GSocketError GSocket_SetPeer(GSocket *socket, GAddress *address)
-{   return socket->SetPeer(address); }
-inline GAddress *GSocket_GetLocal(GSocket *socket)
-{   return socket->GetLocal(); }
-inline GAddress *GSocket_GetPeer(GSocket *socket)
-{   return socket->GetPeer(); }
-inline GSocketError GSocket_SetServer(GSocket *socket)
-{   return socket->SetServer(); }
-inline GSocket *GSocket_WaitConnection(GSocket *socket)
-{   return socket->WaitConnection(); }
-inline GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream)
-{   return socket->Connect(stream); }
-inline GSocketError GSocket_SetNonOriented(GSocket *socket)
-{   return socket->SetNonOriented(); }
-inline int GSocket_Read(GSocket *socket, char *buffer, int size)
-{   return socket->Read(buffer,size); }
-inline int GSocket_Write(GSocket *socket, const char *buffer, int size)
-{   return socket->Write(buffer,size); }
-inline GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
-{   return socket->Select(flags); }
-inline void GSocket_SetNonBlocking(GSocket *socket, int non_block)
-{   socket->SetNonBlocking(non_block); }
-inline void GSocket_SetTimeout(GSocket *socket, unsigned long millisec)
-{   socket->SetTimeout(millisec); }
-inline void GSocket_SetCallback(GSocket *socket, GSocketEventFlags flags,
-                         GSocketCallback fallback, char *cdata)
-{   socket->SetCallback(flags,fallback,cdata); }
-inline void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags)
-{   socket->UnsetCallback(flags); }
-
-#endif /* def wxUSE_GSOCKET_CPLUSPLUS */

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

-/* 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 */
-
-int  _GSocket_GUI_Init(void);
-void _GSocket_GUI_Cleanup(void);
-
-int  _GSocket_GUI_Init_Socket(GSocket *socket);
-void _GSocket_GUI_Destroy_Socket(GSocket *socket);
-
-void _GSocket_Enable_Events(GSocket *socket);
-void _GSocket_Disable_Events(GSocket *socket);
-void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event);
-void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event);
-
-void _GSocket_Enable(GSocket *socket, GSocketEvent event);
-void _GSocket_Disable(GSocket *socket, GSocketEvent event);
-
-#ifndef wxUSE_GSOCKET_CPLUSPLUS
-void _GSocket_Detected_Read(GSocket *socket);
-void _GSocket_Detected_Write(GSocket *socket);
-#endif /* ndef wxUSE_GSOCKET_CPLUSPLUS */

 
 /* GAddress */
 
 
 /* GAddress */