more socket cleanup to allow using wxSocket from both wxBase and wxCore (replaces patch 1756260)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/private/gsocketiohandler.h

@@ -2,7 +2,6 @@
 // Name:        wx/private/gsocketiohandler.h
 // Purpose:     class for registering GSocket in wxSelectDispatcher
 // Authors:     Lukasz Michalski
-// Modified by:
 // Created:     December 2006
 // Copyright:   (c) Lukasz Michalski
 // RCS-ID:      $Id$
@@ -13,30 +12,34 @@
 #define _WX_PRIVATE_GSOCKETIOHANDLER_H_
 
 #include "wx/defs.h"
+
+#if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
+
 #include "wx/private/selectdispatcher.h"
+#include "wx/gsocket.h"
 
-#if wxUSE_SOCKETS
-
-// forward declarations
-class GSocket;
-
-class WXDLLIMPEXP_CORE wxGSocketIOHandler : public wxFDIOHandler
+class WXDLLIMPEXP_BASE wxGSocketIOHandler : public wxFDIOHandler
 {
 public:
-    wxGSocketIOHandler(GSocket* socket);
-    int GetFlags() const;
-    void RemoveFlag(wxFDIODispatcherEntryFlags flag);
-    void AddFlag(wxFDIODispatcherEntryFlags flag);
+    wxGSocketIOHandler(GSocket* socket)
+    {
+        m_socket = socket;
+        m_flags = 0;
+    }
 
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting();
-    virtual void OnExceptionWaiting();
+    int GetFlags() const { return m_flags; }
+    void RemoveFlag(wxFDIODispatcherEntryFlags flag) { m_flags &= ~flag; }
+    void AddFlag(wxFDIODispatcherEntryFlags flag) { m_flags |= flag; }
+
+    virtual void OnReadWaiting() { m_socket->Detected_Read(); }
+    virtual void OnWriteWaiting() { m_socket->Detected_Write(); }
+    virtual void OnExceptionWaiting() { m_socket->Detected_Read(); }
 
 private:
     GSocket* m_socket;
     int m_flags;
 };
 
-#endif // wxUSE_SOCKETS
+#endif // wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER
 
 #endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_