projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed asserts to suppress gcc 3.4 warnings about condition being always true
[wxWidgets.git]
/
src
/
gtk
/
gsockgtk.c
diff --git
a/src/gtk/gsockgtk.c
b/src/gtk/gsockgtk.c
index 3202c6b42139cfae3f9a269aef5b5db625938997..d7f46577412ccb5d6f8feabf68e0559c99b2ac98 100644
(file)
--- a/
src/gtk/gsockgtk.c
+++ b/
src/gtk/gsockgtk.c
@@
-2,6
+2,7
@@
* Project: GSocket (Generic Socket) for WX
* Name: gsockgtk.c
* Purpose: GSocket: GTK part
* Project: GSocket (Generic Socket) for WX
* Name: gsockgtk.c
* Purpose: GSocket: GTK part
+ * Licence: The wxWidgets licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
@@
-9,6
+10,7
@@
#if wxUSE_SOCKETS
#if wxUSE_SOCKETS
+#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
@@
-26,12
+28,21
@@
void _GSocket_GDK_Input(gpointer data,
GSocket *socket = (GSocket *)data;
if (condition & GDK_INPUT_READ)
GSocket *socket = (GSocket *)data;
if (condition & GDK_INPUT_READ)
-
_GSocket_
Detected_Read(socket);
+
socket->m_functions->
Detected_Read(socket);
if (condition & GDK_INPUT_WRITE)
if (condition & GDK_INPUT_WRITE)
-
_GSocket_
Detected_Write(socket);
+
socket->m_functions->
Detected_Write(socket);
}
}
-int _GSocket_GUI_Init(GSocket *socket)
+int _GSocket_GUI_Init(void)
+{
+ return 1;
+}
+
+void _GSocket_GUI_Cleanup(void)
+{
+}
+
+int _GSocket_GUI_Init_Socket(GSocket *socket)
{
gint *m_id;
{
gint *m_id;
@@
-44,7
+55,7
@@
int _GSocket_GUI_Init(GSocket *socket)
return TRUE;
}
return TRUE;
}
-void _GSocket_GUI_Destroy(GSocket *socket)
+void _GSocket_GUI_Destroy
_Socket
(GSocket *socket)
{
free(socket->m_gui_dependent);
}
{
free(socket->m_gui_dependent);
}
@@
-80,6
+91,8
@@
void _GSocket_Uninstall_Callback(GSocket *socket, GSocketEvent event)
gint *m_id = (gint *)(socket->m_gui_dependent);
int c;
gint *m_id = (gint *)(socket->m_gui_dependent);
int c;
+ assert( m_id != NULL );
+
switch (event)
{
case GSOCK_LOST: /* fall-through */
switch (event)
{
case GSOCK_LOST: /* fall-through */