fix wxGTK1 compilation after wxTextEntry DoGetValue() change

[wxWidgets.git] / src / osx / core / sockosx.cpp

diff --git a/src/osx/core/sockosx.cpp b/src/osx/core/sockosx.cpp
index f94012073890c2d62ac98438522b51fad4890857..917b821ce1e233b3de9150f53989e8aa77ae88e2 100644 (file)
--- a/src/osx/core/sockosx.cpp
+++ b/src/osx/core/sockosx.cpp
@@ -129,7 +129,7 @@ private:
         switch (callbackType)
         {
             case kCFSocketConnectCallBack:
-                wxASSERT(!socket->m_server);
+                wxASSERT(!socket->IsServer());
                 // KH: If data is non-NULL, the connect failed, do not call Detected_Write,
                 // which will only end up creating a spurious connect event because the
                 // call to getsocketopt SO_ERROR inexplicably returns no error.
@@ -156,7 +156,7 @@ private:
     CFSocketRef m_socket;
     CFRunLoopSourceRef m_source;
 
-    DECLARE_NO_COPY_CLASS(wxSocketImplMac)
+    wxDECLARE_NO_COPY_CLASS(wxSocketImplMac);
 };
 
 } // anonymous namespace
@@ -219,18 +219,17 @@ int wxSocketManagerMac::GetCFCallback(wxSocketImpl *socket, wxSocketNotify event
     switch ( event )
     {
         case wxSOCKET_CONNECTION:
-            return socket->m_server ? kCFSocketReadCallBack
-                                    : kCFSocketConnectCallBack;
+            return socket->IsServer() ? kCFSocketReadCallBack
+                                      : kCFSocketConnectCallBack;
 
-        case wxSOCKET_LOST:
         case wxSOCKET_INPUT:
             return kCFSocketReadCallBack;
 
         case wxSOCKET_OUTPUT:
             return kCFSocketWriteCallBack;
 
-        case wxSOCKET_MAX_EVENT:
-            wxFAIL_MSG( "invalid wxSocketNotify" );
+        case wxSOCKET_LOST:
+            wxFAIL_MSG( "unexpected wxSocketNotify" );
             return 0;
 
         default: