JPEG handler does not read entire file into memory anymore (+, of course, that header...

[wxWidgets.git] / src / common / socket.cpp

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index cb112f0642a954a7cfe16c06b579140416581dfc..795fc131dde877b4e7150742be94c9fc806db097 100644 (file)
--- 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/utils.h"
 #include "wx/module.h"
 #include "wx/log.h"

+#include "wx/intl.h"

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -45,7 +46,7 @@
 #include "wx/socket.h"
 
 
 #include "wx/socket.h"
 
 

-#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMOTIF__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMOTIF__) || defined(__WXMAC__)

     #define PROCESS_EVENTS() wxYield()
 #elif defined(__WXGTK__)
     #include <gtk/gtk.h>
     #define PROCESS_EVENTS() wxYield()
 #elif defined(__WXGTK__)
     #include <gtk/gtk.h>


@@ -56,12 +57,10 @@
 // --------------------------------------------------------------
 // ClassInfos
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // ClassInfos
 // --------------------------------------------------------------

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_CLASS(wxSocketBase, wxObject)
 IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
 IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
 IMPLEMENT_CLASS(wxSocketBase, wxObject)
 IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
 IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
 IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)

-#endif

 
 class wxSocketState : public wxObject
 {
 
 class wxSocketState : public wxObject
 {


@@ -315,7 +314,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
 
   if (sig != 0xfeeddead)
   {
 
   if (sig != 0xfeeddead)
   {

-    wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));
+    wxLogWarning( _("TCP: invalid signature returned to ReadMsg."));

     goto exit;
   }
 
     goto exit;
   }
 


@@ -451,8 +450,8 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
   m_defer_timer = NULL;
   m_defering = NO_DEFER;
 
   m_defer_timer = NULL;
   m_defering = NO_DEFER;
 

-  wxString s;
-  s.Printf(wxT("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;
   //wxLogMessage(s);
 
   return nbytes-m_defer_nbytes;