wxGLCanvas works again

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 7837b73813c4938d3f07dbdcfee27334750fea7b..9037f92c7ba59a65e7036b90f673e77dfbf0132c 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -80,6 +80,12 @@ class WXDLLEXPORT wxSocketHandler;
 class WXDLLEXPORT wxSocketBase : public wxEvtHandler
 {
   DECLARE_CLASS(wxSocketBase)
 class WXDLLEXPORT wxSocketBase : public wxEvtHandler
 {
   DECLARE_CLASS(wxSocketBase)

+#ifdef __WXMAC__
+  friend void wxMacSocketOnRequestProc(void *refcon , short event) ;
+#endif
+#if defined(__WXGTK__) && defined(WXSOCK_INTERNAL)
+  friend void wxPrereadSocket(wxSocketBase *sock);
+#endif

 public:
 
   enum wxSockFlags { NONE=0, NOWAIT=1, WAITALL=2, SPEED=4 };
 public:
 
   enum wxSockFlags { NONE=0, NOWAIT=1, WAITALL=2, SPEED=4 };


@@ -163,7 +169,7 @@ public:
   inline size_t LastCount() const { return m_lcount; }
   inline int LastError() const { return m_error; }
   
   inline size_t LastCount() const { return m_lcount; }
   inline int LastError() const { return m_error; }
   

-  inline void SetFlags(wxSockFlags _flags);
+  void SetFlags(wxSockFlags _flags);

   inline void SetTimeout(unsigned long sec) { m_timeout = sec; }
 
   // seconds = -1 means infinite wait
   inline void SetTimeout(unsigned long sec) { m_timeout = sec; }
 
   // seconds = -1 means infinite wait


@@ -208,7 +214,15 @@ protected:
   friend class wxSocketServer;
   friend class wxSocketHandler;
 
   friend class wxSocketServer;
   friend class wxSocketHandler;
 

+#ifdef __SALFORDC__
+public:
+#endif
+

   wxSocketBase(wxSockFlags flags, wxSockType type);
   wxSocketBase(wxSockFlags flags, wxSockType type);

+
+#ifdef __SALFORDC__
+protected:
+#endif

   
   bool _Wait(long seconds, long microseconds, int type);
   
   
   bool _Wait(long seconds, long microseconds, int type);
   


@@ -270,7 +284,6 @@ class WXDLLEXPORT wxSocketHandler : public wxObject
 {
   DECLARE_CLASS(wxSocketHandler)
 protected:
 {
   DECLARE_CLASS(wxSocketHandler)
 protected:

-  static wxSocketHandler *master;

 #if defined(__WINDOWS__)
   wxList *smsg_list;
   struct wxSockHandlerInternal *internal;
 #if defined(__WINDOWS__)
   wxList *smsg_list;
   struct wxSockHandlerInternal *internal;


@@ -280,6 +293,7 @@ protected:
 public:
   enum SockStatus { SOCK_NONE, SOCK_DATA, SOCK_CONNECT, SOCK_DISCONNECT,
                    SOCK_ERROR };
 public:
   enum SockStatus { SOCK_NONE, SOCK_DATA, SOCK_CONNECT, SOCK_DISCONNECT,
                    SOCK_ERROR };

+  static wxSocketHandler *master;

 
   wxSocketHandler();
   virtual ~wxSocketHandler();
 
   wxSocketHandler();
   virtual ~wxSocketHandler();


@@ -303,8 +317,7 @@ public:
                        (wxSocketBase::wxSockFlags flags = wxSocketBase::NONE);
 
   // Create or reuse a socket handler
                        (wxSocketBase::wxSockFlags flags = wxSocketBase::NONE);
 
   // Create or reuse a socket handler

-  static wxSocketHandler& Master()
-  { return *((master) ? (master) : (master = new wxSocketHandler())); }
+  static wxSocketHandler& Master() { return *master; }

 
 #if defined(WXSOCK_INTERNAL) && defined(__WINDOWS__)
 
 
 #if defined(WXSOCK_INTERNAL) && defined(__WINDOWS__)
 


@@ -332,6 +345,8 @@ typedef void (wxEvtHandler::*wxSocketEventFunction)(wxSocketEvent&);
 
 #define wxEVT_SOCKET wxEVT_FIRST+301
 
 
 #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
 
 #endif