added GetKind getter

[wxWidgets.git] / include / wx / socket.h

diff --git a/include/wx/socket.h b/include/wx/socket.h
index f04e4b2f1e596ef30fa916305236bf48d9fd6100..8c40673a989e5228f694995e86609aa3dc0f0499 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -22,7 +22,7 @@
 
 #include "wx/event.h"
 #include "wx/sckaddr.h"
-#include "wx/gsocket.h"
+#include "wx/private/gsocket.h"
 #include "wx/list.h"
 
 // ------------------------------------------------------------------------
@@ -160,6 +160,7 @@ public:
   wxSocketFlags GetFlags() const { return m_flags; }
   void SetFlags(wxSocketFlags flags);
   void SetTimeout(long seconds);
+  long GetTimeout() const { return m_timeout; }
 
   bool GetOption(int level, int optname, void *optval, int *optlen);
   bool SetOption(int level, int optname, const void *optval, int optlen);
@@ -194,8 +195,8 @@ private:
   friend class wxDatagramSocket;
 
   // low level IO
-  wxUint32 _Read(void* buffer, wxUint32 nbytes);
-  wxUint32 _Write(const void *buffer, wxUint32 nbytes);
+  wxUint32 DoRead(void* buffer, wxUint32 nbytes);
+  wxUint32 DoWrite(const void *buffer, wxUint32 nbytes);
 
   // wait until the given flags are set for this socket or the given timeout
   // (or m_timeout) expires