X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a64a02efae878d215ac237db36d618e2dde62a68..08f6ac314ae712e2bc8fa59cf688e6bcff76181f:/src/common/socket.cpp?ds=inline diff --git a/src/common/socket.cpp b/src/common/socket.cpp index 3ce909364e..795fc131dd 100644 --- a/src/common/socket.cpp +++ b/src/common/socket.cpp @@ -33,6 +33,7 @@ #include "wx/utils.h" #include "wx/module.h" #include "wx/log.h" +#include "wx/intl.h" #include #include @@ -45,23 +46,21 @@ #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 // -------------------------------------------------------------- // ClassInfos // -------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_CLASS(wxSocketBase, wxObject) IMPLEMENT_CLASS(wxSocketServer, wxSocketBase) IMPLEMENT_CLASS(wxSocketClient, wxSocketBase) IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent) -#endif class wxSocketState : public wxObject { @@ -315,7 +314,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes) if (sig != 0xfeeddead) { - wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg")); + wxLogWarning( _("TCP: invalid signature returned to ReadMsg.")); goto exit; } @@ -451,8 +450,8 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes) m_defer_timer = NULL; m_defering = NO_DEFER; - wxString s; - s.Printf("Saliendo de DeferWrite: total %d bytes", nbytes-m_defer_nbytes); + //wxString s; + //s.Printf(wxT("Saliendo de DeferWrite: total %d bytes"), nbytes-m_defer_nbytes); //wxLogMessage(s); return nbytes-m_defer_nbytes;