projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a void* to wxObject* conversion error in a return causing compile break across...
[wxWidgets.git]
/
include
/
wx
/
msw
/
gsockmsw.h
diff --git
a/include/wx/msw/gsockmsw.h
b/include/wx/msw/gsockmsw.h
index 6cd735b092a05233d506622d84398ce04fddb28f..ba6a2848d52326b197da7efb782a0c6a3f0ff7eb 100644
(file)
--- a/
include/wx/msw/gsockmsw.h
+++ b/
include/wx/msw/gsockmsw.h
@@
-21,9
+21,11
@@
#include "gsocket.h"
#endif
#include "gsocket.h"
#endif
+#if defined(__BORLANDC__)
+#include <windows.h>
+#endif
#include <winsock.h>
#include <winsock.h>
-
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-36,6
+38,7
@@
struct _GSocket
GAddress *m_peer;
GSocketError m_error;
GAddress *m_peer;
GSocketError m_error;
+ /* Attributes */
bool m_non_blocking;
bool m_server;
bool m_stream;
bool m_non_blocking;
bool m_server;
bool m_stream;
@@
-43,6
+46,7
@@
struct _GSocket
struct timeval m_timeout;
/* Callbacks */
struct timeval m_timeout;
/* Callbacks */
+ GSocketEventFlags m_detected;
GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
char *m_data[GSOCK_MAX_EVENT];
int m_msgnumber;
GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
char *m_data[GSOCK_MAX_EVENT];
int m_msgnumber;
@@
-72,7
+76,8
@@
int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
/* Callbacks */
/* Callbacks */
-void _GSocket_Configure_Callbacks(GSocket *socket);
+void _GSocket_Enable_Events(GSocket *socket);
+void _GSocket_Disable_Events(GSocket *socket);
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
/* GAddress */
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
/* GAddress */