Tried to make wxGLCanvas work again. WIP.

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

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 32689fe50ddf3768b191ee10f5706573d6717c61..e9f958b92838cfea6489fd02e58cd95077bc1a11 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -45,12 +45,12 @@
 #include "wx/socket.h"
 
 
 #include "wx/socket.h"
 
 

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

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

-#endif  
+#endif

 
 
 // --------------------------------------------------------------
 
 
 // --------------------------------------------------------------


@@ -188,7 +188,7 @@ wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
     DoDefer();
   }
 
     DoDefer();
   }
 

-  // Wait for buffer completion. 
+  // Wait for buffer completion.

   while (m_defer_buffer != NULL)
     PROCESS_EVENTS();
 
   while (m_defer_buffer != NULL)
     PROCESS_EVENTS();
 


@@ -235,13 +235,13 @@ wxUint32 wxSocketBase::_Read(char* buffer, wxUint32 nbytes)
 
   // If the socket is not connected, or we have got the whole
   // needed buffer, return immedately
 
   // If the socket is not connected, or we have got the whole
   // needed buffer, return immedately

-  if (!m_connected || !m_socket || !nbytes) 
+  if (!m_connected || !m_socket || !nbytes)

     return total;
 
   // Possible combinations (they are checked in this order)
   // NOWAIT
   // SPEED | WAITALL
     return total;
 
   // Possible combinations (they are checked in this order)
   // NOWAIT
   // SPEED | WAITALL

-  // SPEED          
+  // SPEED

   // WAITALL
   // NONE
   //
   // WAITALL
   // NONE
   //


@@ -316,7 +316,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 +374,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;
   }
 


@@ -442,7 +442,7 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
     DoDefer();
   }
 
     DoDefer();
   }
 

-  // Wait for buffer completion. 
+  // Wait for buffer completion.

   while (m_defer_buffer != NULL)
     PROCESS_EVENTS();
 
   while (m_defer_buffer != NULL)
     PROCESS_EVENTS();
 


@@ -490,7 +490,7 @@ wxUint32 wxSocketBase::_Write(const char *buffer, wxUint32 nbytes)
   // Possible combinations (they are checked in this order)
   // NOWAIT
   // SPEED | WAITALL
   // Possible combinations (they are checked in this order)
   // NOWAIT
   // SPEED | WAITALL

-  // SPEED          
+  // SPEED

   // WAITALL
   // NONE
   //
   // WAITALL
   // NONE
   //


@@ -686,7 +686,7 @@ wxSocketBase& wxSocketBase::Discard()
 
   // TODO: TriggerRead
   return *this;
 
   // TODO: TriggerRead
   return *this;

-  
+

 #undef MAX_BUFSIZE
 }
 
 #undef MAX_BUFSIZE
 }
 


@@ -901,7 +901,7 @@ void wxSocketBase::SetFlags(wxSockFlags _flags)
 {
   m_flags = _flags;
 }
 {
   m_flags = _flags;
 }

-                    
+

 // --------------------------------------------------------------
 // wxSocketBase callback management
 // --------------------------------------------------------------
 // --------------------------------------------------------------
 // wxSocketBase callback management
 // --------------------------------------------------------------