Work on streams of all sorts. More to come.

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

diff --git a/include/wx/sckint.h b/include/wx/sckint.h
index 8d90c4b133e289cb269ef3141435ab13cf664ae9..1b1ae550836949d48f7393dfdba4152a8f10e866 100644 (file)
--- a/include/wx/sckint.h
+++ b/include/wx/sckint.h
@@ -15,12 +15,14 @@
 #pragma interface
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_SOCKETS
 
-#include <wx/object.h>
-#include <wx/list.h>
-#include <wx/socket.h>
-#include <wx/thread.h>
+#include "wx/object.h"
+#include "wx/list.h"
+#include "wx/socket.h"
+#include "wx/thread.h"
 
 // Socket state
 class SocketState
@@ -82,7 +84,11 @@ class SocketWaiter: public wxThread {
   int m_fd;
 };
 
-class SocketRequester: public wxThread {
+class SocketRequester
+#if wxUSE_THREADS
+  : public wxThread 
+#endif
+         {
  public:
   SocketRequester(wxSocketBase *socket, wxSocketInternal *internal);
   ~SocketRequester();
@@ -118,6 +124,7 @@ class wxSocketInternal {
   void ReleaseFD();
 
   int GetFD() { return m_fd; }
+  void SetFD(int fd) { m_fd = fd; }
   
   void ResumeWaiter();
   void StopWaiter();
@@ -135,8 +142,8 @@ class wxSocketInternal {
   wxMutex m_socket_locker, m_fd_locker, m_request_locker, m_end_requester;
   wxCondition m_socket_cond;
   SocketWaiter *m_thread_waiter;
-  SocketRequester *m_thread_requester;
 #endif
+  SocketRequester *m_thread_requester;
   wxList m_requests;
   int m_fd;
   bool m_invalid_requester;