AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

and the compilation fix which really compiles, finally

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 1999-10-21 19:44:11 +00:00
parent 6663339816
commit a64a02efae
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/wx/socket.h
View File

@ -35,17 +35,19 @@
#include "wx/gsocket.h"
// ------------------------------------------------------------------------
// GSocket type alias
// constants
// ------------------------------------------------------------------------
typedef enum {
enum wxSocketNotify
{
wxSOCKET_INPUT = GSOCK_INPUT,
wxSOCKET_OUTPUT = GSOCK_OUTPUT,
wxSOCKET_CONNECTION = GSOCK_CONNECTION,
wxSOCKET_LOST = GSOCK_LOST
} wxSocketNotify;
};
enum {
enum
{
wxSOCKET_INPUT_FLAG = GSOCK_INPUT_FLAG,
wxSOCKET_OUTPUT_FLAG = GSOCK_OUTPUT_FLAG,
wxSOCKET_CONNECTION_FLAG = GSOCK_CONNECTION_FLAG,
@ -54,7 +56,8 @@ enum {
typedef GSocketEventFlags wxSocketEventFlags;
typedef enum {
enum wxSocketError
{
wxSOCKET_NOERROR = GSOCK_NOERROR,
wxSOCKET_INPOP = GSOCK_INVOP,
wxSOCKET_IOERR = GSOCK_IOERR,
@ -66,17 +69,26 @@ typedef enum {
wxSOCKET_TIMEDOUT = GSOCK_TIMEDOUT,
wxSOCKET_MEMERR = GSOCK_MEMERR,
wxSOCKET_BUSY
} wxSocketError;
};
enum {
enum
{
wxSOCKET_NONE = 0,
wxSOCKET_NOWAIT = 1,
wxSOCKET_WAITALL = 2,
wxSOCKET_BLOCK = 4
};
// this is ugly but necessary for backwards compatibility
#define wxSockFlags wxSocketBase::wxSockFlags
// Type of request
enum wxSockType
{
SOCK_CLIENT,
SOCK_SERVER,
SOCK_INTERNAL,
SOCK_UNINIT
};
typedef int wxSockFlags;
// ------------------------------------------------------------------------
// wxSocket base
@ -89,17 +101,14 @@ class WXDLLEXPORT wxSocketBase : public wxEvtHandler
DECLARE_CLASS(wxSocketBase)
public:
enum {
enum
{
NONE = wxSOCKET_NONE,
NOWAIT = wxSOCKET_NOWAIT,
WAITALL = wxSOCKET_WAITALL,
SPEED = wxSOCKET_BLOCK
};
// Type of request
typedef int wxSockFlags;
enum wxSockType { SOCK_CLIENT, SOCK_SERVER, SOCK_INTERNAL, SOCK_UNINIT };
typedef void (*wxSockCbk)(wxSocketBase& sock, wxSocketNotify evt, char *cdata);
protected:

5
src/common/socket.cpp
View File

@ -68,7 +68,7 @@ class wxSocketState : public wxObject
public:
bool notify_state;
GSocketEventFlags evt_notify_state;
wxSocketBase::wxSockFlags socket_flags;
wxSockFlags socket_flags;
wxSocketBase::wxSockCbk c_callback;
char *c_callback_data;
@ -80,8 +80,7 @@ public:
// wxSocketBase ctor and dtor
// --------------------------------------------------------------
wxSocketBase::wxSocketBase(wxSocketBase::wxSockFlags _flags,
wxSocketBase::wxSockType _type) :
wxSocketBase::wxSocketBase(wxSockFlags _flags, wxSockType _type) :
wxEvtHandler(),
m_socket(NULL), m_id(-1),
m_flags(_flags), m_type(_type),