X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37465b7281eb2a5202b765f1b67b4ec6126f816c..13b4df952c77383f50696e51fcbaa2d8bbd3b3b9:/src/motif/sockmot.cpp?ds=sidebyside diff --git a/src/motif/sockmot.cpp b/src/motif/sockmot.cpp index f38ace8e97..4dec63eb92 100644 --- a/src/motif/sockmot.cpp +++ b/src/motif/sockmot.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: motif/sockmot.cpp +// Name: src/motif/sockmot.cpp // Purpose: implementation of wxMotif-specific socket event handling // Author: Guilhem Lavaux, Vadim Zeitlin // Created: 1999 @@ -15,7 +15,7 @@ #include // XtAppAdd/RemoveInput() #include "wx/motif/private.h" // wxGetAppContext() -#include "wx/private/socket.h" +#include "wx/private/fdiomanager.h" #include "wx/apptrait.h" extern "C" { @@ -23,7 +23,7 @@ extern "C" { static void wxSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid), XtInputId *WXUNUSED(id)) { - wxSocketImpl * const handler = static_cast(data); + wxFDIOHandler * const handler = static_cast(data); handler->OnReadWaiting(); } @@ -31,39 +31,40 @@ static void wxSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid), static void wxSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid), XtInputId *WXUNUSED(id)) { - wxSocketImpl * const handler = static_cast(data); + wxFDIOHandler * const handler = static_cast(data); handler->OnWriteWaiting(); } } -class MotifSocketManager : public wxSocketInputBasedManager +class MotifFDIOManager : public wxFDIOManager { public: - virtual int AddInput(wxSocketImpl *handler, int fd, SocketDir d) + virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d) { return XtAppAddInput ( wxGetAppContext(), fd, - (XtPointer)(d == FD_OUTPUT ? XtInputWriteMask - : XtInputReadMask), - d == FD_OUTPUT ? wxSocket_Motif_Output - : wxSocket_Motif_Input, + (XtPointer)(d == OUTPUT ? XtInputWriteMask + : XtInputReadMask), + d == OUTPUT ? wxSocket_Motif_Output + : wxSocket_Motif_Input, handler ); } - virtual void RemoveInput(int fd) + virtual void + RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d)) { XtRemoveInput(fd); } }; -wxSocketManager *wxGUIAppTraits::GetSocketManager() +wxFDIOManager *wxGUIAppTraits::GetFDIOManager() { - static MotifSocketManager s_manager; + static MotifFDIOManager s_manager; return &s_manager; }