Fix to prevent Assert when there is an empty string in a combobox/choice.

[wxWidgets.git] / src / unix / gsockunx.h

diff --git a/src/unix/gsockunx.h b/src/unix/gsockunx.h
index 75a70ceee94cb624876b32ab37817540929dd740..79321a2374f52e7cf4a7dd44e43b7c0ba9240c30 100644 (file)
--- a/src/unix/gsockunx.h
+++ b/src/unix/gsockunx.h
@@ -8,7 +8,16 @@
 #ifndef __GSOCK_UNX_H
 #define __GSOCK_UNX_H
 
-#include <wx/gsocket.h>
+#include "wx/setup.h"
+
+#if wxUSE_SOCKETS
+
+#include "wx/gsocket.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* Definition of GSocket */
 struct _GSocket {
@@ -16,11 +25,11 @@ struct _GSocket {
   GAddress *m_local, *m_peer;
   GSocketError m_error;
 
-  bool m_blocking, m_server, m_stream, m_oriented;
+  bool m_non_blocking, m_server, m_stream, m_oriented;
   unsigned long m_timeout;
 
   /* Callbacks */
-  GSocketCallback m_fbacks[GSOCK_MAX_EVENT];
+  GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
 
   /* IO calls associated */
@@ -66,4 +75,12 @@ GSocketError _GAddress_Init_INET(GAddress *address);
 /* Local address family */
 GSocketError _GAddress_Init_UNIX(GAddress *address);
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif
+    /* wxUSE_SOCKETS */
+
 #endif
+    /* __GSOCK_UNX_H */