projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;
[wxWidgets.git]
/
src
/
gtk1
/
gsockgtk.c
diff --git
a/src/gtk1/gsockgtk.c
b/src/gtk1/gsockgtk.c
index 7c464b5e52dae49f46ed28a8a58bca03c0acd0b2..3202c6b42139cfae3f9a269aef5b5db625938997 100644
(file)
--- a/
src/gtk1/gsockgtk.c
+++ b/
src/gtk1/gsockgtk.c
@@
-31,7
+31,7
@@
void _GSocket_GDK_Input(gpointer data,
_GSocket_Detected_Write(socket);
}
_GSocket_Detected_Write(socket);
}
-
void
_GSocket_GUI_Init(GSocket *socket)
+
int
_GSocket_GUI_Init(GSocket *socket)
{
gint *m_id;
{
gint *m_id;
@@
-40,6
+40,8
@@
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(GSocket *socket)
@@
-58,7
+60,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;
@@
-81,7
+83,7
@@
void _GSocket_Uninstall_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;
@@
-105,4
+107,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 */