added pragmas to disable icc warning when va_arg is used with a pointer type

[wxWidgets.git] / src / motif / evtloop.cpp

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index d92da8a1eb9dd6adfe9f82741d0766487e6c6792..c2f7d4ac31d3b036a9ec5c3b427f4915c937896e 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "evtloop.h"
-#endif
-
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
@@ -46,6 +42,7 @@
 #pragma message enable nosimpint
 #endif
 
+#include "wx/unix/private.h"
 #include "wx/motif/private.h"
 
 static bool CheckForKeyUp(XEvent* event);
@@ -387,7 +384,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
 #include <sys/time.h>
 #include <unistd.h>
 
-static XtInputId inputId;
 static int idleFds[2] = { -1, -1 };
 
 class wxIdlePipeModule : public wxModule
@@ -429,8 +425,8 @@ static void wxInputCallback( XtPointer, int* fd, XtInputId* )
         timeout.tv_sec = 0;
         timeout.tv_usec = 0;
 
-        FD_ZERO( &in );
-        FD_SET( *fd, &in );
+        wxFD_ZERO( &in );
+        wxFD_SET( *fd, &in );
 
         if( select( *fd + 1, &in, NULL, NULL, &timeout ) <= 0 )
             break;
@@ -450,8 +446,8 @@ static void wxBreakDispatch()
     timeout.tv_sec = 0;
     timeout.tv_usec = 0;
 
-    FD_ZERO( &in );
-    FD_SET( idleFds[0], &in );
+    wxFD_ZERO( &in );
+    wxFD_SET( idleFds[0], &in );
 
     if( select( idleFds[0] + 1, &in, NULL, NULL, &timeout ) > 0 )
         return;
@@ -478,11 +474,11 @@ bool wxAddIdleCallback()
         return false;
     
     // install input handler for wxWakeUpIdle
-    inputId = XtAppAddInput( (XtAppContext) wxTheApp->GetAppContext(),
-                             idleFds[0],
-                             (XtPointer)XtInputReadMask,
-                             wxInputCallback,
-                             NULL );
+    XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
+                  idleFds[0],
+                  (XtPointer)XtInputReadMask,
+                  wxInputCallback,
+                  NULL);
 
     return true;
 }