compilation fix: wxGenericCollapsiblePane needs wxButton and wxStaticLine

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index d04a733fd0f778da1123312a9d9e4a22610cc676..ee2578f3c213ff08ca2901e1c37fae0a70ffa450 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -108,7 +108,8 @@ public:
   bool Destroy();
 
   // state
-  inline bool Ok() const { return (m_socket != NULL); };
+  inline bool Ok() const { return IsOk(); }
+  inline bool IsOk() const { return (m_socket != NULL); };
   inline bool Error() const { return m_error; };
   inline bool IsConnected() const { return m_connected; };
   inline bool IsData() { return WaitForRead(0, 0); };
@@ -256,7 +257,7 @@ public:
   virtual ~wxSocketClient();
 
   virtual bool Connect(wxSockAddress& addr, bool wait = true);
-  virtual bool Connect(wxSockAddress& addr, wxSockAddress& local, bool wait = true);
+  bool Connect(wxSockAddress& addr, wxSockAddress& local, bool wait = true);
 
   bool WaitOnConnect(long seconds = -1, long milliseconds = 0);