Changed some more name in wxSocket (internal)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/socket.h b/include/wx/socket.h
index ec578d12d981059cbb9d399200a2446dd9d17ba4..ba17e64804fcc3dceebc8b85d77293f24c691cfa 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -88,7 +88,7 @@ protected:
   GSocket *m_socket;                   // wxSocket socket
   wxSockFlags m_flags;                 // wxSocket flags
   wxSockType m_type;                   // wxSocket type
   GSocket *m_socket;                   // wxSocket socket
   wxSockFlags m_flags;                 // wxSocket flags
   wxSockType m_type;                   // wxSocket type

-  GSocketEventFlags m_neededreq;       // Specify which requet signals we need
+  wxSocketEventFlags m_neededreq;      // Specify which requet signals we need

   size_t m_lcount;                     // Last IO request size
   unsigned long m_timeout;             // IO timeout value
 
   size_t m_lcount;                     // Last IO request size
   unsigned long m_timeout;             // IO timeout value
 


@@ -204,7 +204,7 @@ protected:
 
   int DeferRead(char *buffer, size_t nbytes);
   int DeferWrite(const char *buffer, size_t nbytes);
 
   int DeferRead(char *buffer, size_t nbytes);
   int DeferWrite(const char *buffer, size_t nbytes);

-  void DoDefer(GSocketEvent evt);
+  void DoDefer(wxSocketNotify evt);

 
   // Pushback library
   size_t GetPushback(char *buffer, size_t size, bool peek);
 
   // Pushback library
   size_t GetPushback(char *buffer, size_t size, bool peek);


@@ -247,13 +247,13 @@ class WXDLLEXPORT wxSocketEvent : public wxEvent {
 public:
   wxSocketEvent(int id = 0);
 
 public:
   wxSocketEvent(int id = 0);
 

-  wxSocketNotify SocketEvent() const { return (wxSocketNotify)m_skevt; }
+  wxSocketNotify SocketEvent() const { return m_skevt; }

   wxSocketBase *Socket() const { return m_socket; }
 
   void CopyObject(wxObject& obj_d) const;
 
 public:
   wxSocketBase *Socket() const { return m_socket; }
 
   void CopyObject(wxObject& obj_d) const;
 
 public:

-  GSocketEvent m_skevt;
+  wxSocketNotify m_skevt;

   wxSocketBase *m_socket;
 };
 
   wxSocketBase *m_socket;
 };
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 399c4f5cd4fa3252818a068d93b9b6721ebf7615..6201f0de4da9d9213306736ee3acf33cd15c8a37 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -141,7 +141,7 @@ class _wxSocketInternalTimer: public wxTimer {
 
 int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
 {
 
 int wxSocketBase::DeferRead(char *buffer, size_t nbytes)
 {

-  GSocketEventFlags old_event_flags;
+  wxSocketEventFlags old_event_flags;

   bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;
   bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;


@@ -300,7 +300,7 @@ wxSocketBase& wxSocketBase::Peek(char* buffer, size_t nbytes)
 
 int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
 {
 
 int wxSocketBase::DeferWrite(const char *buffer, size_t nbytes)
 {

-  GSocketEventFlags old_event_flags;
+  wxSocketEventFlags old_event_flags;

   bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;
   bool old_notify_state;
   // Timer for timeout
   _wxSocketInternalTimer timer;


@@ -417,11 +417,11 @@ bool wxSocketBase::IsData() const
   return (GSocket_DataAvailable(m_socket));
 }
 
   return (GSocket_DataAvailable(m_socket));
 }
 

-void wxSocketBase::DoDefer(GSocketEvent req_evt)
+void wxSocketBase::DoDefer(wxSocketNotify req_evt)

 {
   int ret;
 
 {
   int ret;
 

-  if (req_evt == GSOCK_LOST) {
+  if (req_evt == wxSOCKET_LOST) {

     Close();
     m_defer_buffer = NULL;
     return;
     Close();
     m_defer_buffer = NULL;
     return;


@@ -706,21 +706,21 @@ void wxSocketBase::Notify(bool notify)
 void wxSocketBase::OnRequest(wxSocketNotify req_evt)
 {
   wxSocketEvent event(m_id);
 void wxSocketBase::OnRequest(wxSocketNotify req_evt)
 {
   wxSocketEvent event(m_id);

-  GSocketEventFlags notify = EventToNotify(req_evt);
+  wxSocketEventFlags notify = EventToNotify(req_evt);

 
   if (m_defering != NO_DEFER) {
 
   if (m_defering != NO_DEFER) {

-    DoDefer((GSocketEvent)req_evt);
+    DoDefer(req_evt);

     return;
   }
 
   if ((m_neededreq & notify) == notify) {
     event.m_socket = this;
     return;
   }
 
   if ((m_neededreq & notify) == notify) {
     event.m_socket = this;

-    event.m_skevt = (GSocketEvent) req_evt;
+    event.m_skevt  = req_evt;

     ProcessEvent(event);
     OldOnNotify(req_evt);
   }
 
     ProcessEvent(event);
     OldOnNotify(req_evt);
   }
 

-  if ((GSocketEvent)req_evt == GSOCK_LOST)
+  if (req_evt == wxSOCKET_LOST)

     Close();
 }
 
     Close();
 }