document column reordering in wxListCtrl; fix confusion between GetColumnOrder()...

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

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index d90bb540b7145fa93f035536065f0298f69025cf..9fa9e77fbf3e9f0f01a243a2e9e13f68e4fc638c 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -11,6 +11,8 @@
 #ifndef _WX_UNIX_GSOCKUNX_H_
 #define _WX_UNIX_GSOCKUNX_H_
 
+#include <unistd.h>
+
 class wxGSocketIOHandler;
 
 class GSocket : public GSocketBase
@@ -19,14 +21,9 @@ public:
     GSocket(wxSocketBase& wxsocket);
     virtual ~GSocket();
 
-    virtual void Close();
     virtual void Shutdown();
     virtual GSocket *WaitConnection(wxSocketBase& wxsocket);
 
-    GSocketError SetLocal(GAddress *address);
-    GSocketError SetPeer(GAddress *address);
-    GAddress *GetLocal();
-    GAddress *GetPeer();
     GSocketError SetServer();
     bool SetReusable();
     bool SetBroadcast();
@@ -45,12 +42,35 @@ public:
     void Detected_Read();
     void Detected_Write();
 
-protected:
-    //enable or disable event callback using gsocket gui callback table
-    void EnableEvents(bool flag = true);
-    void DisableEvents() { EnableEvents(false); }
-    void Enable(GSocketEvent event);
-    void Disable(GSocketEvent event);
+private:
+    // enable or disable notifications for socket input/output events but only
+    // if m_use_events is true; do nothing otherwise
+    void EnableEvents()
+    {
+        if ( m_use_events )
+            DoEnableEvents(true);
+    }
+
+    void DisableEvents()
+    {
+        if ( m_use_events )
+            DoEnableEvents(false);
+    }
+
+    // really enable or disable socket input/output events, regardless of
+    // m_use_events value
+    void DoEnableEvents(bool enable);
+
+
+    // enable or disable events for the given event if m_use_events; do nothing
+    // otherwise
+    //
+    // notice that these functions also update m_detected: EnableEvent() clears
+    // the corresponding bit in it and DisableEvent() sets it
+    void EnableEvent(GSocketEvent event);
+    void DisableEvent(GSocketEvent event);
+
+
     GSocketError Input_Timeout();
     GSocketError Output_Timeout();
     int Recv_Stream(char *buffer, int size);
@@ -96,20 +116,18 @@ public:
 
         return true;
     }
-    virtual void Destroy_Socket(GSocket *socket)
-    {
-        free(socket->m_gui_dependent);
-    }
 
-    virtual void Enable_Events(GSocket *socket)
-    {
-        Install_Callback(socket, GSOCK_INPUT);
-        Install_Callback(socket, GSOCK_OUTPUT);
-    }
-    virtual void Disable_Events(GSocket *socket)
+    virtual void Close_Socket(GSocket *socket)
     {
         Uninstall_Callback(socket, GSOCK_INPUT);
         Uninstall_Callback(socket, GSOCK_OUTPUT);
+
+        close(socket->m_fd);
+    }
+
+    virtual void Destroy_Socket(GSocket *socket)
+    {
+        free(socket->m_gui_dependent);
     }
 
 protected: