porting reordering of controls back from 2.8

[wxWidgets.git] / include / wx / private / selectdispatcher.h

diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index eea139f37c6b2fa5506f1249211ff0981dfc1f16..9ee71d4f9fb11b34d1d1fc12587a5ac95e196dc3 100644 (file)
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -15,7 +15,13 @@
 
 #if wxUSE_SELECT_DISPATCHER
 
-#include <sys/types.h>
+#ifdef __WATCOMC__
+  #include <types.h>
+  #include <sys/ioctl.h>
+  #include <sys/select.h>
+#else
+  #include <sys/types.h>
+#endif
 
 #include "wx/private/fdiodispatcher.h"
 
@@ -76,8 +82,8 @@ private:
 class WXDLLIMPEXP_BASE wxSelectDispatcher : public wxMappedFDIODispatcher
 {
 public:
-    // creates an instance of this class, the caller takes ownership of it
-    static wxSelectDispatcher *Create();
+    // default ctor
+    wxSelectDispatcher() { m_maxFD = -1; }
 
     // implement pure virtual methods of the base class
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
@@ -85,10 +91,6 @@ public:
     virtual bool UnregisterFD(int fd);
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
-protected:
-    // ctor is not public, use Create()
-    wxSelectDispatcher();
-
 private:
     // common part of RegisterFD() and ModifyFD()
     bool DoUpdateFDAndHandler(int fd, wxFDIOHandler *handler, int flags);