colors are only set if non-black, otherwise Enable(false) does not gray them out

[wxWidgets.git] / src / mac / carbon / gsocket.c

diff --git a/src/mac/carbon/gsocket.c b/src/mac/carbon/gsocket.c
index b96cd92358778215770f8812d92b13c3d35e01a2..073d97c483d1aa245318acd3a0102e13416582d6 100644 (file)
--- a/src/mac/carbon/gsocket.c
+++ b/src/mac/carbon/gsocket.c
@@ -36,7 +36,7 @@
   #include <OpenTransportProviders.h>
   #include <OpenTptInternet.h>
 #endif
-#if TARGET_CARBON
+#if TARGET_CARBON && !defined(OTAssert)
   #define OTAssert( str , cond ) /* does not exists in Carbon */
 #endif
 
@@ -76,6 +76,13 @@
 
 #endif /* __GSOCKET_STANDALONE__ */
 
+#ifndef ntohl
+#define        ntohl(x)        (x)
+#define        ntohs(x)        (x)
+#define        htonl(x)        (x)
+#define        htons(x)        (x)
+#endif
+
 void wxCYield() ;
 #ifdef __WXDEBUG__
 #define qDebug 1
@@ -87,6 +94,7 @@ extern pascal void OTDebugStr(const char* str);
 #endif
 InetSvcRef gInetSvcRef = 0 ;
 int gOTInited = 0 ;
+OTNotifyUPP gOTNotifierUPP = NULL ;
 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 
@@ -185,7 +193,7 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
        junk = OTSetBlocking(ep);
        OTAssert("SetDefaultEndpointModes: Could not set blocking", junk == noErr);
 */
-       junk = OTInstallNotifier(ep, OTInetEventHandler, data);
+       junk = OTInstallNotifier(ep, gOTNotifierUPP, data);
        OTAssert("SetDefaultEndpointModes: Could not install notifier", junk == noErr);
 /*
        junk = OTUseSyncIdleEvents(ep, true);
@@ -195,6 +203,11 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 /* Global initialisers */
 
+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *table)
+{
+    // do nothing, wxMac doesn't have wxBase-GUI separation yet
+}
+
 int GSocket_Init()
 {
     return TRUE;
@@ -229,6 +242,7 @@ int GSocket_Verify_Inited()
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }
+    gOTNotifierUPP = NewOTNotifyUPP( OTInetEventHandler ) ;
     return TRUE ;
 }
 
@@ -243,6 +257,8 @@ void GSocket_Cleanup()
     #else
       CloseOpenTransport() ;
     #endif
+        if ( gOTNotifierUPP )
+            DisposeOTNotifyUPP( gOTNotifierUPP ) ;
     }
 }
 
@@ -1067,7 +1083,7 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
        OTByteCount sz = 0 ;
 
        OTCountDataBytes( socket->m_endpoint , &sz ) ;
-       if ( size > sz )
+       if ( size > (int)sz )
          size = sz ;
        res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
        if ( res < 0 )
@@ -1319,7 +1335,7 @@ GSocketError GAddress_INET_SetHostAddress(GAddress *address,
 
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
 
-  address->m_host = hostaddr ;
+  address->m_host = htonl(hostaddr) ;
 
   return GSOCK_NOERROR;
 }
@@ -1340,7 +1356,7 @@ service_entry gServices[] =
 GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
                                        const char *protocol)
 {
-  int i ;
+  size_t i ;
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);
@@ -1400,7 +1416,7 @@ unsigned long GAddress_INET_GetHostAddress(GAddress *address)
   assert(address != NULL); 
   CHECK_ADDRESS(address, INET, 0); 
 
-  return address->m_host;
+  return ntohl(address->m_host);
 }
 
 unsigned short GAddress_INET_GetPort(GAddress *address)