Removed duplicate xh_grid.cpp/h and rebaked files

[wxWidgets.git] / include / wx / mac / carbon / gsockmac.h

diff --git a/include/wx/mac/carbon/gsockmac.h b/include/wx/mac/carbon/gsockmac.h
index 2dcdbe65e018ebc7646ad77eaf7ab634f637a875..de035d0d4011ae6393fcb702b7e28d152aeb2ee3 100644 (file)
--- a/include/wx/mac/carbon/gsockmac.h
+++ b/include/wx/mac/carbon/gsockmac.h
@@ -1,8 +1,10 @@
 /* -------------------------------------------------------------------------
 /* -------------------------------------------------------------------------

- * Project: GSocket (Generic Socket) for WX
- * Name:    gsockunx.h
- * Purpose: GSocket Macintosh header
- * CVSID:   $Id$
+ * Project:     GSocket (Generic Socket) for WX
+ * Name:        gsockunx.h
+ * Copyright:   (c) Guilhem Lavaux
+ * Licence:     wxWindows Licence
+ * Purpose:     GSocket Macintosh header
+ * CVSID:       $Id$

  * -------------------------------------------------------------------------
  */
 
  * -------------------------------------------------------------------------
  */
 


@@ -21,19 +23,25 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

+#ifndef OTUNIXERRORS
+

 #include <MacHeaders.c>
 #define OTUNIXERRORS 1
 #include <MacHeaders.c>
 #define OTUNIXERRORS 1

+// we get a conflict in OT headers otherwise :
+#undef EDEADLK

 #include <OpenTransport.h>
 #include <OpenTransportProviders.h>
 #include <OpenTptInternet.h>
 
 #include <OpenTransport.h>
 #include <OpenTransportProviders.h>
 #include <OpenTptInternet.h>
 

+#endif
+

 /* Definition of GSocket */
 class GSocket
 {
 public:
     GSocket();
     ~GSocket();
 /* Definition of GSocket */
 class GSocket
 {
 public:
     GSocket();
     ~GSocket();

-    bool IsOK() { return m_ok; }
+    bool IsOk() { return m_ok; }

 
     void Shutdown();
     GSocketError SetLocal(GAddress *address);
 
     void Shutdown();
     GSocketError SetLocal(GAddress *address);


@@ -42,13 +50,13 @@ public:
     GAddress *GetPeer();
     GSocketError SetServer();
     GSocket *WaitConnection();
     GAddress *GetPeer();
     GSocketError SetServer();
     GSocket *WaitConnection();

-    int SetReusable() { return 0; }
+    bool SetReusable() { return false; }

     GSocketError SetNonOriented();
     GSocketError Connect(GSocketStream stream);
     int Read(char *buffer, int size);
     int Write(const char *buffer, int size);
     GSocketEventFlags Select(GSocketEventFlags flags);
     GSocketError SetNonOriented();
     GSocketError Connect(GSocketStream stream);
     int Read(char *buffer, int size);
     int Write(const char *buffer, int size);
     GSocketEventFlags Select(GSocketEventFlags flags);

-    void SetNonBlocking(int non_block);
+    void SetNonBlocking(bool non_block);

     void SetTimeout(unsigned long millisec);
     GSocketError WXDLLIMPEXP_NET GetError();
     void SetCallback(GSocketEventFlags flags,
     void SetTimeout(unsigned long millisec);
     GSocketError WXDLLIMPEXP_NET GetError();
     void SetCallback(GSocketEventFlags flags,


@@ -83,17 +91,17 @@ public:
   GAddress *m_peer;
   GSocketError m_error;
 
   GAddress *m_peer;
   GSocketError m_error;
 

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

   unsigned long m_timeout;
 
   /* Callbacks */
   GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];
   unsigned long m_timeout;
 
   /* Callbacks */
   GSocketEventFlags m_detected;
   GSocketCallback m_cbacks[GSOCK_MAX_EVENT];
   char *m_data[GSOCK_MAX_EVENT];

-  int m_takesEvents ;
+  bool m_takesEvents ;

 };
 
 
 };