remember the events we were notified about in OnRequest() (not used yet but necessary...

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

diff --git a/include/wx/socket.h b/include/wx/socket.h
index 1b72a2cd56eb22b46cd6f850f768779616a6355d..f0736f4f05f6ed876c7a7da0a3d6aabb3a0fbcb1 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -101,8 +101,6 @@ enum wxSocketType
 
 class WXDLLIMPEXP_NET wxSocketBase : public wxObject
 {
-  DECLARE_CLASS(wxSocketBase)
-
 public:
 
   // Public interface
@@ -251,11 +249,13 @@ private:
   void         *m_clientData;       // client data for events
   bool          m_notify;           // notify events to users?
   wxSocketEventFlags  m_eventmask;  // which events to notify?
+  wxSocketEventFlags  m_eventsgot;  // collects events received in OnRequest()
 
   // the initialization count, GSocket is initialized if > 0
   static size_t m_countInit;
 
   DECLARE_NO_COPY_CLASS(wxSocketBase)
+  DECLARE_CLASS(wxSocketBase)
 };
 
 

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index e99a4a017fed031202f39ac6cc883038c0396d89..406b5c0ae12944d8fb0db1e241666a2c7f635b01 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -612,7 +612,8 @@ void wxSocketBase::Init()
     m_handler      = NULL;
     m_clientData   = NULL;
     m_notify       = false;
-    m_eventmask    = 0;
+    m_eventmask    =
+    m_eventsgot    = 0;
 
     if ( !IsInitialized() )
     {
@@ -1457,7 +1458,7 @@ void wxSocketBase::SetFlags(wxSocketFlags flags)
 
 void wxSocketBase::OnRequest(wxSocketNotify notification)
 {
-    switch(notification)
+    switch ( notification )
     {
         case wxSOCKET_CONNECTION:
             m_establishing = false;
@@ -1488,32 +1489,42 @@ void wxSocketBase::OnRequest(wxSocketNotify notification)
             return;
     }
 
-    // Schedule the event
-
     wxSocketEventFlags flag = 0;
-    wxUnusedVar(flag);
-    switch (notification)
+    switch ( notification )
     {
-        case wxSOCKET_INPUT:      flag = wxSOCKET_INPUT_FLAG; break;
-        case wxSOCKET_OUTPUT:     flag = wxSOCKET_OUTPUT_FLAG; break;
-        case wxSOCKET_CONNECTION: flag = wxSOCKET_CONNECTION_FLAG; break;
-        case wxSOCKET_LOST:       flag = wxSOCKET_LOST_FLAG; break;
+        case wxSOCKET_INPUT:
+            flag = wxSOCKET_INPUT_FLAG;
+            break;
+
+        case wxSOCKET_OUTPUT:
+            flag = wxSOCKET_OUTPUT_FLAG;
+            break;
+
+        case wxSOCKET_CONNECTION:
+            flag = wxSOCKET_CONNECTION_FLAG;
+            break;
+
+        case wxSOCKET_LOST:
+            flag = wxSOCKET_LOST_FLAG;
+            break;
+
         default:
-                               wxLogWarning(_("wxSocket: unknown event!."));
-                               return;
+            wxFAIL_MSG( "unknown wxSocket notification" );
     }
 
-    if (((m_eventmask & flag) == flag) && m_notify)
+    // remember the events which were generated for this socket, we're going to
+    // use this in DoWait()
+    m_eventsgot |= flag;
+
+    // send the wx event if enabled and we're interested in it
+    if ( m_notify && (m_eventmask & flag) && m_handler )
     {
-        if (m_handler)
-        {
-            wxSocketEvent event(m_id);
-            event.m_event      = notification;
-            event.m_clientData = m_clientData;
-            event.SetEventObject(this);
+        wxSocketEvent event(m_id);
+        event.m_event      = notification;
+        event.m_clientData = m_clientData;
+        event.SetEventObject(this);
 
-            m_handler->AddPendingEvent(event);
-        }
+        m_handler->AddPendingEvent(event);
     }
 }