#ifdef wxUSE_LIBJPEG changed to #if wxUSELIBJPEG

[wxWidgets.git] / include / wx / socket.h

diff --git a/include/wx/socket.h b/include/wx/socket.h
index c9e161331c3481eba4d18d26d6df57be28056554..ebd5a5ecd68aceed4ca4919d360c59eab16d2bb7 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -80,6 +80,9 @@ class WXDLLEXPORT wxSocketHandler;
 class WXDLLEXPORT wxSocketBase : public wxEvtHandler
 {
   DECLARE_CLASS(wxSocketBase)
+#ifdef __WXMAC__
+friend void wxMacSocketOnRequestProc(void *refcon , short event) ;
+#endif
 public:
 
   enum wxSockFlags { NONE=0, NOWAIT=1, WAITALL=2, SPEED=4 };
@@ -208,7 +211,15 @@ protected:
   friend class wxSocketServer;
   friend class wxSocketHandler;
 
+#ifdef __SALFORDC__
+public:
+#endif
+
   wxSocketBase(wxSockFlags flags, wxSockType type);
+
+#ifdef __SALFORDC__
+protected:
+#endif
   
   bool _Wait(long seconds, long microseconds, int type);
   
@@ -331,6 +342,8 @@ typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 
 #define wxEVT_SOCKET wxEVT_FIRST+301
 
-#define EVT_SOCKET(id, func) { wxEVT_SOCKET, id, 0, (wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func },
+#define EVT_SOCKET(id, func) { wxEVT_SOCKET, id, 0, \
+  (wxObjectEventFunction) (wxEventFunction) (wxSocketEventFunction) & func, \
+  (wxObject *) NULL  },
 
 #endif