Prototypes for some _internal_ functions had to be changed (API remains the same)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
// Name: socket.h
|
// Name: socket.h
|
||||||
// Purpose: Socket handling classes
|
// Purpose: Socket handling classes
|
||||||
// Author: Guilhem Lavaux
|
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
|
||||||
// Modified by:
|
// Modified by:
|
||||||
// Created: April 1997
|
// Created: April 1997
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
@@ -82,13 +82,13 @@ public:
|
|||||||
// Type of request
|
// Type of request
|
||||||
|
|
||||||
enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
|
enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
|
||||||
typedef void (*wxSockCbk)(wxSocketBase& sock,wxSocketNotify evt,char *cdata);
|
typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
GSocket *m_socket; // wxSocket socket
|
GSocket *m_socket; // wxSocket socket
|
||||||
wxSockFlags m_flags; // wxSocket flags
|
wxSockFlags m_flags; // wxSocket flags
|
||||||
wxSockType m_type; // wxSocket type
|
wxSockType m_type; // wxSocket type
|
||||||
wxSocketEventFlags m_neededreq; // Specify which requet signals we need
|
wxSocketEventFlags m_neededreq; // Which events we are interested in
|
||||||
wxUint32 m_lcount; // Last IO request size
|
wxUint32 m_lcount; // Last IO request size
|
||||||
unsigned long m_timeout; // IO timeout value
|
unsigned long m_timeout; // IO timeout value
|
||||||
|
|
||||||
@@ -167,7 +167,7 @@ public:
|
|||||||
// Setup event handler
|
// Setup event handler
|
||||||
void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1);
|
void SetEventHandler(wxEvtHandler& evt_hdlr, int id = -1);
|
||||||
|
|
||||||
// Method called when it happens something on the socket
|
// Method called when something happens in the socket
|
||||||
void SetNotify(wxSocketEventFlags flags);
|
void SetNotify(wxSocketEventFlags flags);
|
||||||
virtual void OnRequest(wxSocketNotify req_evt);
|
virtual void OnRequest(wxSocketNotify req_evt);
|
||||||
|
|
||||||
@@ -201,11 +201,11 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool _Wait(long seconds, long milliseconds, int type);
|
bool _Wait(long seconds, long milliseconds, wxSocketEventFlags flags);
|
||||||
|
|
||||||
int DeferRead(char *buffer, wxUint32 nbytes);
|
int DeferRead(char *buffer, wxUint32 nbytes);
|
||||||
int DeferWrite(const char *buffer, wxUint32 nbytes);
|
int DeferWrite(const char *buffer, wxUint32 nbytes);
|
||||||
void DoDefer(wxSocketNotify evt);
|
void DoDefer();
|
||||||
|
|
||||||
// Pushback library
|
// Pushback library
|
||||||
wxUint32 GetPushback(char *buffer, wxUint32 size, bool peek);
|
wxUint32 GetPushback(char *buffer, wxUint32 size, bool peek);
|
||||||
|
Reference in New Issue
Block a user