Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed some more name in wxSocket (internal)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-09-05 06:46:38 +00:00
parent da4a658da4
commit de3131e784
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/socket.h
View File

@@ -88,7 +88,7 @@ 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
GSocketEventFlags m_neededreq; // Specify which requet signals we need wxSocketEventFlags m_neededreq; // Specify which requet signals we need
size_t m_lcount; // Last IO request size size_t m_lcount; // Last IO request size
unsigned long m_timeout; // IO timeout value unsigned long m_timeout; // IO timeout value
@@ -204,7 +204,7 @@ protected:
int DeferRead(char *buffer, size_t nbytes); int DeferRead(char *buffer, size_t nbytes);
int DeferWrite(const char *buffer, size_t nbytes); int DeferWrite(const char *buffer, size_t nbytes);
void DoDefer(GSocketEvent evt); void DoDefer(wxSocketNotify evt);
// Pushback library // Pushback library
size_t GetPushback(char *buffer, size_t size, bool peek); size_t GetPushback(char *buffer, size_t size, bool peek);
@@ -247,13 +247,13 @@ class WXDLLEXPORT wxSocketEvent : public wxEvent {
public: public:
wxSocketEvent(int id = 0); wxSocketEvent(int id = 0);
wxSocketNotify SocketEvent() const { return (wxSocketNotify)m_skevt; } wxSocketNotify SocketEvent() const { return m_skevt; }
wxSocketBase *Socket() const { return m_socket; } wxSocketBase *Socket() const { return m_socket; }
void CopyObject(wxObject& obj_d) const; void CopyObject(wxObject& obj_d) const;
public: public:
GSocketEvent m_skevt; wxSocketNotify m_skevt;
wxSocketBase *m_socket; wxSocketBase *m_socket;
}; };

16
src/common/socket.cpp
View File

@@ -141,7 +141,7 @@ class _wxSocketInternalTimer: public wxTimer {
int wxSocketBase::DeferRead(char *buffer, size_t nbytes) int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
{ {
GSocketEventFlags old_event_flags; wxSocketEventFlags old_event_flags;
bool old_notify_state; bool old_notify_state;
// Timer for timeout // Timer for timeout
_wxSocketInternalTimer timer; _wxSocketInternalTimer timer;
@@ -300,7 +300,7 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes) int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
{ {
GSocketEventFlags old_event_flags; wxSocketEventFlags old_event_flags;
bool old_notify_state; bool old_notify_state;
// Timer for timeout // Timer for timeout
_wxSocketInternalTimer timer; _wxSocketInternalTimer timer;
@@ -417,11 +417,11 @@ bool wxSocketBase::IsData() const
return (GSocket_DataAvailable(m_socket)); return (GSocket_DataAvailable(m_socket));
} }
void wxSocketBase::DoDefer(GSocketEvent req_evt) void wxSocketBase::DoDefer(wxSocketNotify req_evt)
{ {
int ret; int ret;
if (req_evt == GSOCK_LOST) { if (req_evt == wxSOCKET_LOST) {
Close(); Close();
m_defer_buffer = NULL; m_defer_buffer = NULL;
return; return;
@@ -706,21 +706,21 @@ void wxSocketBase::Notify(bool notify)
void wxSocketBase::OnRequest(wxSocketNotify req_evt) void wxSocketBase::OnRequest(wxSocketNotify req_evt)
{ {
wxSocketEvent event(m_id); wxSocketEvent event(m_id);
GSocketEventFlags notify = EventToNotify(req_evt); wxSocketEventFlags notify = EventToNotify(req_evt);
if (m_defering != NO_DEFER) { if (m_defering != NO_DEFER) {
DoDefer((GSocketEvent)req_evt); DoDefer(req_evt);
return; return;
} }
if ((m_neededreq & notify) == notify) { if ((m_neededreq & notify) == notify) {
event.m_socket = this; event.m_socket = this;
event.m_skevt = (GSocketEvent) req_evt; event.m_skevt = req_evt;
ProcessEvent(event); ProcessEvent(event);
OldOnNotify(req_evt); OldOnNotify(req_evt);
} }
if ((GSocketEvent)req_evt == GSOCK_LOST) if (req_evt == wxSOCKET_LOST)
Close(); Close();
} }