X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0a56ab0c38aac05101593488c7e0972c36c38b7..07cf98cb8eb7625eeffc95e407a9fa1ad863b451:/src/common/socket.cpp?ds=sidebyside diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 5f23f76f9c..0f7a633165 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -45,11 +45,11 @@ #include "wx/socket.h" -#if defined(__WXMSW__) || defined(__WXPM__) -#define PROCESS_EVENTS() wxYield() +#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMOTIF__) || defined(__WXMAC__) + #define PROCESS_EVENTS() wxYield() #elif defined(__WXGTK__) -#include -#define PROCESS_EVENTS() gtk_main_iteration() + #include + #define PROCESS_EVENTS() gtk_main_iteration() #endif @@ -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), @@ -316,7 +315,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) if (sig != 0xfeeddead) { - wxLogMessage(T("Warning: invalid signature returned to ReadMsg")); + wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); goto exit; } @@ -374,7 +373,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) if (sig != 0xdeadfeed) { - //wxLogMessage(T("Warning: invalid signature returned to ReadMsg")); + //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); goto exit; } @@ -453,7 +452,7 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes) m_defering = NO_DEFER; wxString s; - s.Printf("Saliendo de DeferWrite: total %d bytes", nbytes-m_defer_nbytes); + s.Printf(wxT("Saliendo de DeferWrite: total %d bytes"), nbytes-m_defer_nbytes); //wxLogMessage(s); return nbytes-m_defer_nbytes;