unifying CFTypes

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

diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp
index ffcd57563c224a9e491d874bc024a148f6c996a9..b38c4d775923338801ea3e48bca07701d3ee732d 100644 (file)
--- a/src/gtk/gsockgtk.cpp
+++ b/src/gtk/gsockgtk.cpp
@@ -1,12 +1,13 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket) for WX
- * Name:    gsockgtk.c
+ * Name:    src/gtk/gsockgtk.cpp
  * Purpose: GSocket: GTK part
  * Licence: The wxWindows licence
  * CVSID:   $Id$
  * -------------------------------------------------------------------------
  */
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #if wxUSE_SOCKETS
 
@@ -21,8 +22,10 @@
 #include "wx/unix/gsockunx.h"
 
 
+extern "C" {
+static
 void _GSocket_GDK_Input(gpointer data,
-                        gint source,
+                        gint WXUNUSED(source),
                         GdkInputCondition condition)
 {
   GSocket *socket = (GSocket *)data;
@@ -32,6 +35,7 @@ void _GSocket_GDK_Input(gpointer data,
   if (condition & GDK_INPUT_WRITE)
     socket->Detected_Write();
 }
+}
 
 bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
 {   return true; }
@@ -44,7 +48,7 @@ bool GSocketGUIFunctionsTableConcrete::OnInit(void)
 void GSocketGUIFunctionsTableConcrete::OnExit(void)
 {
 }
-    
+
 bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
 {
   gint *m_id;
@@ -106,9 +110,10 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket, GSock
   }
 
   if (m_id[c] != -1)
+  {
     gdk_input_remove(m_id[c]);
-
-  m_id[c] = -1;
+    m_id[c] = -1;
+  }
 }
 
 void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
@@ -123,9 +128,4 @@ void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
   Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
-#else /* !wxUSE_SOCKETS */
-
-/* some compilers don't like having empty source files */
-static int wxDummyGsockVar = 0;
-
-#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */
+#endif // wxUSE_SOCKETS