1. slightly changed how wxControlContainer is used

[wxWidgets.git] / include / wx / unix / gsockunx.h

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index e44fef0eb310c0dcf4bdfc6a1be9b31631fb83eb..dc0e17071641b2b2fa0ceb504c6798281fdbde90 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -26,10 +26,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
 extern "C" {
 #endif /* __cplusplus */
 

-#if !defined(__cplusplus)
-typedef int bool;
-#endif
-

 #ifndef TRUE
 #define TRUE 1
 #endif
 #ifndef TRUE
 #define TRUE 1
 #endif


@@ -47,11 +43,11 @@ struct _GSocket
   GAddress *m_peer;
   GSocketError m_error;
 
   GAddress *m_peer;
   GSocketError m_error;
 

-  bool m_non_blocking;
-  bool m_server;
-  bool m_stream;
-  bool m_oriented;
-  bool m_establishing;
+  int m_non_blocking;
+  int m_server;
+  int m_stream;
+  int m_oriented;
+  int m_establishing;

   unsigned long m_timeout;
 
   /* Callbacks */
   unsigned long m_timeout;
 
   /* Callbacks */


@@ -85,7 +81,7 @@ int _GSocket_Send_Dgram(GSocket *socket, const char *buffer, int size);
 
 /* Callbacks */
 
 
 /* Callbacks */
 

-bool _GSocket_GUI_Init(GSocket *socket);
+int  _GSocket_GUI_Init(GSocket *socket);

 void _GSocket_GUI_Destroy(GSocket *socket);
 
 void _GSocket_Enable_Events(GSocket *socket);
 void _GSocket_GUI_Destroy(GSocket *socket);
 
 void _GSocket_Enable_Events(GSocket *socket);