fix memory leak in wxScreenDC, fixes #13249

[wxWidgets.git] / src / motif / sockmot.cpp

diff --git a/src/motif/sockmot.cpp b/src/motif/sockmot.cpp
index 6e347bfe60ee4cc154c7dfd66b03602feb1c8e66..4dec63eb92207fa704068649df52b95af78b437f 100644 (file)
--- 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
 // Purpose:     implementation of wxMotif-specific socket event handling
 // Author:      Guilhem Lavaux, Vadim Zeitlin
 // Created:     1999


@@ -15,7 +15,7 @@
 
 #include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
 #include "wx/motif/private.h"   // wxGetAppContext()
 
 #include <X11/Intrinsic.h>      // XtAppAdd/RemoveInput()
 #include "wx/motif/private.h"   // wxGetAppContext()

-#include "wx/private/socket.h"
+#include "wx/private/fdiomanager.h"

 #include "wx/apptrait.h"
 
 extern "C" {
 #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))
 {
 static void wxSocket_Motif_Input(XtPointer data, int *WXUNUSED(fid),
                                  XtInputId *WXUNUSED(id))
 {

-    wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
+    wxFDIOHandler * const handler = static_cast<wxFDIOHandler *>(data);

 
     handler->OnReadWaiting();
 }
 
     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))
 {
 static void wxSocket_Motif_Output(XtPointer data, int *WXUNUSED(fid),
                                   XtInputId *WXUNUSED(id))
 {

-    wxSocketImplUnix * const handler = static_cast<wxSocketImplUnix *>(data);
+    wxFDIOHandler * const handler = static_cast<wxFDIOHandler *>(data);

 
     handler->OnWriteWaiting();
 }
 
 }
 
 
     handler->OnWriteWaiting();
 }
 
 }
 

-class MotifSocketManager : public wxSocketInputBasedManager
+class MotifFDIOManager : public wxFDIOManager

 {
 public:
 {
 public:

-    virtual int AddInput(wxSocketImplUnix *handler, int fd, SocketDir d)
+    virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d)

     {
         return XtAppAddInput
                (
                     wxGetAppContext(),
                     fd,
     {
         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
                );
     }
 
                     handler
                );
     }
 

-    virtual void RemoveInput(int fd)
+    virtual void
+    RemoveInput(wxFDIOHandler* WXUNUSED(handler), int fd, Direction WXUNUSED(d))

     {
         XtRemoveInput(fd);
     }
 };
 
     {
         XtRemoveInput(fd);
     }
 };
 

-wxSocketManager *wxGUIAppTraits::GetSocketManager()
+wxFDIOManager *wxGUIAppTraits::GetFDIOManager()

 {
 {

-    static MotifSocketManager s_manager;
+    static MotifFDIOManager s_manager;

     return &s_manager;
 }
 
     return &s_manager;
 }