Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 19:59:19 +00:00
parent bd090f77ee
commit 17a1ebd101
86 changed files with 713 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/x11/evtloop.cpp
View File

@@ -27,6 +27,7 @@
#include "wx/timer.h"
#include "wx/hash.h"
#include "wx/module.h"
#include "wx/unix/private.h"
#include "wx/x11/private.h"
#include "X11/Xlib.h"
@@ -174,14 +175,14 @@ void wxSocketTable::FillSets(fd_set* readset, fd_set* writeset, int* highest)
if (entry->m_fdInput != -1)
{
FD_SET(entry->m_fdInput, readset);
wxFD_SET(entry->m_fdInput, readset);
if (entry->m_fdInput > *highest)
* highest = entry->m_fdInput;
}
if (entry->m_fdOutput != -1)
{
FD_SET(entry->m_fdOutput, writeset);
wxFD_SET(entry->m_fdOutput, writeset);
if (entry->m_fdOutput > *highest)
* highest = entry->m_fdOutput;
}
@@ -198,12 +199,12 @@ void wxSocketTable::ProcessEvents(fd_set* readset, fd_set* writeset)
{
wxSocketTableEntry* entry = (wxSocketTableEntry*) node->GetData();
if (entry->m_fdInput != -1 && FD_ISSET(entry->m_fdInput, readset))
if (entry->m_fdInput != -1 && wxFD_ISSET(entry->m_fdInput, readset))
{
(entry->m_callbackInput) (entry->m_fdInput, entry->m_dataInput);
}
if (entry->m_fdOutput != -1 && FD_ISSET(entry->m_fdOutput, writeset))
if (entry->m_fdOutput != -1 && wxFD_ISSET(entry->m_fdOutput, writeset))
{
(entry->m_callbackOutput) (entry->m_fdOutput, entry->m_dataOutput);
}
@@ -455,10 +456,10 @@ bool wxEventLoop::Dispatch()
fd_set readset;
fd_set writeset;
int highest = fd;
FD_ZERO(&readset);
FD_ZERO(&writeset);
wxFD_ZERO(&readset);
wxFD_ZERO(&writeset);
FD_SET(fd, &readset);
wxFD_SET(fd, &readset);
#if wxUSE_SOCKETS
if (wxTheSocketTable)
@@ -473,7 +474,7 @@ bool wxEventLoop::Dispatch()
else
{
// An X11 event was pending, so get it
if (FD_ISSET( fd, &readset ))
if (wxFD_ISSET( fd, &readset ))
XNextEvent( wxGlobalDisplay(), &event );
#if wxUSE_SOCKETS