don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/mac/gsocket.c b/src/mac/gsocket.c
index b96cd92358778215770f8812d92b13c3d35e01a2..9e3ba3079a4c3e75ef5dc34ed064c596d7ef37a8 100644 (file)
--- a/src/mac/gsocket.c
+++ b/src/mac/gsocket.c
@@ -36,7 +36,7 @@
   #include <OpenTransportProviders.h>
   #include <OpenTptInternet.h>
 #endif
   #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
 
   #define OTAssert( str , cond ) /* does not exists in Carbon */
 #endif
 


@@ -87,6 +87,7 @@ extern pascal void OTDebugStr(const char* str);
 #endif
 InetSvcRef gInetSvcRef = 0 ;
 int gOTInited = 0 ;
 #endif
 InetSvcRef gInetSvcRef = 0 ;
 int gOTInited = 0 ;

+OTNotifyUPP gOTNotifierUPP = NULL ;

 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 
 
 OSStatus DoNegotiateIPReuseAddrOption(EndpointRef ep, Boolean enableReuseIPMode);
 


@@ -185,7 +186,7 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
        junk = OTSetBlocking(ep);
        OTAssert("SetDefaultEndpointModes: Could not set blocking", junk == noErr);
 */
        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);
        OTAssert("SetDefaultEndpointModes: Could not install notifier", junk == noErr);
 /*
        junk = OTUseSyncIdleEvents(ep, true);


@@ -195,6 +196,11 @@ static void SetDefaultEndpointModes(EndpointRef ep , void *data )
 
 /* Global initialisers */
 
 
 /* Global initialisers */
 

+void GSocket_SetGUIFunctions(struct GSocketGUIFunctionsTable *table)
+{
+    // do nothing, wxMac doesn't have wxBase-GUI separation yet
+}
+

 int GSocket_Init()
 {
     return TRUE;
 int GSocket_Init()
 {
     return TRUE;


@@ -229,6 +235,7 @@ int GSocket_Verify_Inited()
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }
        OTAssert("Could not open Inet Services", err == noErr);
        return FALSE ;
     }

+    gOTNotifierUPP = NewOTNotifyUPP( OTInetEventHandler ) ;

     return TRUE ;
 }
 
     return TRUE ;
 }
 


@@ -243,6 +250,8 @@ void GSocket_Cleanup()
     #else
       CloseOpenTransport() ;
     #endif
     #else
       CloseOpenTransport() ;
     #endif

+        if ( gOTNotifierUPP )
+            DisposeOTNotifyUPP( gOTNotifierUPP ) ;

     }
 }
 
     }
 }
 


@@ -1067,7 +1076,7 @@ int _GSocket_Recv_Stream(GSocket *socket, char *buffer, int size)
        OTByteCount sz = 0 ;
 
        OTCountDataBytes( socket->m_endpoint , &sz ) ;
        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 )
          size = sz ;
        res = OTRcv( socket->m_endpoint , buffer , size , &flags ) ;
        if ( res < 0 )


@@ -1340,7 +1349,7 @@ service_entry gServices[] =
 GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
                                        const char *protocol)
 {
 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);
 
   assert(address != NULL);
   CHECK_ADDRESS(address, INET, GSOCK_INVADDR);