1. undid my wrong fix to wxWindowBase::Centre

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 5f23f76f9cf4df5555613015a65e2f0a09ec2c81..0f7a63316572f5aa12582fd38cc4dd34d8598285 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -45,11 +45,11 @@
 #include "wx/socket.h"
 
 
 #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__)
 #elif defined(__WXGTK__)

-#include <gtk/gtk.h>
-#define PROCESS_EVENTS() gtk_main_iteration()
+    #include <gtk/gtk.h>
+    #define PROCESS_EVENTS() gtk_main_iteration()

 #endif
 
 
 #endif
 
 


@@ -68,7 +68,7 @@ class wxSocketState : public wxObject
 public:
   bool notify_state;
   GSocketEventFlags evt_notify_state;
 public:
   bool notify_state;
   GSocketEventFlags evt_notify_state;

-  wxSocketBase::wxSockFlags socket_flags;
+  wxSockFlags socket_flags;

   wxSocketBase::wxSockCbk c_callback;
   char *c_callback_data;
 
   wxSocketBase::wxSockCbk c_callback;
   char *c_callback_data;
 


@@ -80,8 +80,7 @@ public:
 // wxSocketBase ctor and dtor
 // --------------------------------------------------------------
 
 // 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),
   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)
   {
 
   if (sig != 0xfeeddead)
   {

-    wxLogMessage(T("Warning: invalid signature returned to ReadMsg"));
+    wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));

     goto exit;
   }
 
     goto exit;
   }
 


@@ -374,7 +373,7 @@ wxSocketBase& wxSocketBase::ReadMsg(char* buffer, wxUint32 nbytes)
 
   if (sig != 0xdeadfeed)
   {
 
   if (sig != 0xdeadfeed)
   {

-    //wxLogMessage(T("Warning: invalid signature returned to ReadMsg"));
+    //wxLogMessage(wxT("Warning: invalid signature returned to ReadMsg"));

     goto exit;
   }
 
     goto exit;
   }
 


@@ -453,7 +452,7 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
   m_defering = NO_DEFER;
 
   wxString s;
   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;
   //wxLogMessage(s);
 
   return nbytes-m_defer_nbytes;