PROCESS_EVENTS macro added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
25a37c8cb1
commit
5c15428b75
@ -44,13 +44,15 @@
|
|||||||
#include "wx/sckaddr.h"
|
#include "wx/sckaddr.h"
|
||||||
#include "wx/socket.h"
|
#include "wx/socket.h"
|
||||||
|
|
||||||
// GRG: Why is this needed?
|
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#if defined(__WXMSW__)
|
||||||
|
#define PROCESS_EVENTS() wxYield()
|
||||||
|
#elif defined(__WXGTK__)
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#define wxYield() gtk_main_iteration()
|
#define PROCESS_EVENTS() gtk_main_iteration()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
// ClassInfos
|
// ClassInfos
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
@ -188,7 +190,7 @@ wxUint32 wxSocketBase::DeferRead(char *buffer, wxUint32 nbytes)
|
|||||||
|
|
||||||
// Wait for buffer completion.
|
// Wait for buffer completion.
|
||||||
while (m_defer_buffer != NULL)
|
while (m_defer_buffer != NULL)
|
||||||
wxYield();
|
PROCESS_EVENTS();
|
||||||
|
|
||||||
timer.Stop();
|
timer.Stop();
|
||||||
|
|
||||||
@ -442,7 +444,7 @@ wxUint32 wxSocketBase::DeferWrite(const char *buffer, wxUint32 nbytes)
|
|||||||
|
|
||||||
// Wait for buffer completion.
|
// Wait for buffer completion.
|
||||||
while (m_defer_buffer != NULL)
|
while (m_defer_buffer != NULL)
|
||||||
wxYield();
|
PROCESS_EVENTS();
|
||||||
|
|
||||||
timer.Stop();
|
timer.Stop();
|
||||||
|
|
||||||
@ -770,7 +772,7 @@ void wxSocketBase::RestoreState()
|
|||||||
// they poll the socket, using GSocket_Select(), to check for
|
// they poll the socket, using GSocket_Select(), to check for
|
||||||
// the specified combination of event flags, until an event
|
// the specified combination of event flags, until an event
|
||||||
// occurs or until the timeout ellapses. The polling loop
|
// occurs or until the timeout ellapses. The polling loop
|
||||||
// calls wxYield(), so this won't block the GUI.
|
// calls PROCESS_EVENTS(), so this won't block the GUI.
|
||||||
|
|
||||||
bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
|
bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags flags)
|
||||||
{
|
{
|
||||||
@ -848,7 +850,7 @@ bool wxSocketBase::_Wait(long seconds, long milliseconds, wxSocketEventFlags fla
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (timeout != 0)
|
if (timeout != 0)
|
||||||
wxYield();
|
PROCESS_EVENTS();
|
||||||
}
|
}
|
||||||
while ((state == -1) && timeout);
|
while ((state == -1) && timeout);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user