projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make it possible to override translatable status of text entry
[wxWidgets.git]
/
src
/
gtk1
/
gsockgtk.c
diff --git
a/src/gtk1/gsockgtk.c
b/src/gtk1/gsockgtk.c
index 7c464b5e52dae49f46ed28a8a58bca03c0acd0b2..0115e520db9d43b6a3a0af9e1a1d5be03d46bfa4 100644
(file)
--- a/
src/gtk1/gsockgtk.c
+++ b/
src/gtk1/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 wxWindows 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);
}
}
-void _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;
@@
-40,9
+51,11
@@
void _GSocket_GUI_Init(GSocket *socket)
m_id[0] = -1;
m_id[1] = -1;
m_id[0] = -1;
m_id[1] = -1;
+
+ 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);
}
@@
-58,7
+71,7
@@
void _GSocket_Install_Callback(GSocket *socket, GSocketEvent event)
switch (event)
{
case GSOCK_LOST: /* fall-through */
switch (event)
{
case GSOCK_LOST: /* fall-through */
- case GSOCK_INPUT: c = 0; break;
+ case GSOCK_INPUT: c = 0; break;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
@@
-78,10
+91,12
@@
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 */
- case GSOCK_INPUT: c = 0; break;
+ case GSOCK_INPUT: c = 0; break;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
case GSOCK_OUTPUT: c = 1; break;
case GSOCK_CONNECTION: c = ((socket->m_server) ? 0 : 1); break;
default: return;
@@
-105,4
+120,9
@@
void _GSocket_Disable_Events(GSocket *socket)
_GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
}
_GSocket_Uninstall_Callback(socket, GSOCK_OUTPUT);
}
-#endif /* wxUSE_SOCKETS */
+#else /* !wxUSE_SOCKETS */
+
+/* some compilers don't like having empty source files */
+static int wxDummyGsockVar = 0;
+
+#endif /* wxUSE_SOCKETS/!wxUSE_SOCKETS */