Streamline wxSocket code: wxSocketBase now uses wxSocketImpl (previously known

[wxWidgets.git] / src / gtk1 / gsockgtk.cpp

diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp
index 0c034edfeff5167f049382e243aac3a17661cb90..8a6eab720cb59c10905e0a07c52b56c18bac6730 100644 (file)
--- a/src/gtk1/gsockgtk.cpp
+++ b/src/gtk1/gsockgtk.cpp
@@ -24,29 +24,29 @@
 
 extern "C" {
 static
-void _GSocket_GDK_Input(gpointer data,
+void wxSocket_GDK_Input(gpointer data,
                         gint WXUNUSED(source),
                         GdkInputCondition condition)
 {
-  GSocket *socket = (GSocket *)data;
+  wxSocketImpl const *socket = static_cast<wxSocketImpl *>(data);
 
-  if (condition & GDK_INPUT_READ)
+  if ( condition & GDK_INPUT_READ )
     socket->Detected_Read();
-  if (condition & GDK_INPUT_WRITE)
+  if ( condition & GDK_INPUT_WRITE )
     socket->Detected_Write();
 }
 }
 
-class GTKSocketManager : public GSocketInputBasedManager
+class GTKSocketManager : public wxSocketInputBasedManager
 {
 public:
-    virtual int AddInput(GSocket *socket, SocketDir d)
+    virtual int AddInput(wxSocketImpl *socket, SocketDir d)
     {
         return gdk_input_add
                (
                     socket->m_fd,
                     d == FD_OUTPUT ? GDK_INPUT_WRITE : GDK_INPUT_READ,
-                    _GSocket_GDK_Input,
+                    wxSocket_GDK_Input,
                     socket
                );
     }
@@ -57,7 +57,7 @@ public:
     }
 };
 
-GSocketManager *wxGUIAppTraits::GetSocketManager()
+wxSocketManager *wxGUIAppTraits::GetSocketManager()
 {
     static GTKSocketManager s_manager;
     return &s_manager;