*** empty log message ***

[wxWidgets.git] / include / wx / msw / gsockmsw.h

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 001c18be4668064777603040812092fdd3da0bde..e745060b5817c42bbce2746a8d27ccb3400df8ef 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -9,7 +9,13 @@
 #ifndef __GSOCK_MSW_H
 #define __GSOCK_MSW_H
 
-#ifdef __WXMSW__
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/gsocket.h"
 #else
 #include "gsocket.h"
@@ -18,6 +24,10 @@
 #include <winsock.h>
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Definition of GSocket */
 struct _GSocket
 {
@@ -26,6 +36,7 @@ struct _GSocket
   GAddress *m_peer;
   GSocketError m_error;
 
+  /* Attributes */
   bool m_non_blocking;
   bool m_server;
   bool m_stream;
@@ -33,6 +44,7 @@ struct _GSocket
   struct timeval m_timeout;
 
   /* Callbacks */
+  GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
   int m_msgnumber;
@@ -51,10 +63,6 @@ struct _GAddress
 };
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);
@@ -66,7 +74,8 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* 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 */
@@ -84,4 +93,6 @@ GSocketError _GAddress_Init_UNIX(GAddress *address);
 }
 #endif
 
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
 #endif  /* __GSOCK_MSW_H */