1. coloured buttons seem to work

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

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 001c18be4668064777603040812092fdd3da0bde..ba6a2848d52326b197da7efb782a0c6a3f0ff7eb 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -9,14 +9,26 @@
 #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"
 #endif
 
+#if defined(__BORLANDC__)
+#include <windows.h>
+#endif
 #include <winsock.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Definition of GSocket */
 struct _GSocket
@@ -26,6 +38,7 @@ struct _GSocket
   GAddress *m_peer;
   GSocketError m_error;
 
+  /* Attributes */
   bool m_non_blocking;
   bool m_server;
   bool m_stream;
@@ -33,6 +46,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 +65,6 @@ struct _GAddress
 };
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Input / output */
 
 GSocketError _GSocket_Input_Timeout(GSocket *socket);
@@ -66,7 +76,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 +95,6 @@ GSocketError _GAddress_Init_UNIX(GAddress *address);
 }
 #endif
 
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
 #endif  /* __GSOCK_MSW_H */