readability cleanup

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

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index f0dd4fdfe73b6e5057f38d1eb562e1cd2dd1b2c2..205496ca057d002ec9f4bf2a2da4f7d859c227a8 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        motif/evtloop.cpp
+// Name:        src/motif/evtloop.cpp

 // Purpose:     implements wxEventLoop for Motif
 // Author:      Mattia Barbon
 // Modified by:
 // Purpose:     implements wxEventLoop for Motif
 // Author:      Mattia Barbon
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "evtloop.h"
-#endif
-

 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY
 #ifdef __VMS
 #define XtParent XTPARENT
 #define XtDisplay XTDISPLAY


@@ -46,6 +42,7 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/unix/private.h"

 #include "wx/motif/private.h"
 
 static bool CheckForKeyUp(XEvent* event);
 #include "wx/motif/private.h"
 
 static bool CheckForKeyUp(XEvent* event);


@@ -260,7 +257,7 @@ bool CheckForAccelerator(XEvent* event)
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window

-        while (widget && !(win = wxGetWindowFromTable(widget)))
+        while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))

             widget = XtParent(widget);
 
         if (!widget || !win)
             widget = XtParent(widget);
 
         if (!widget || !win)


@@ -294,7 +291,7 @@ bool CheckForKeyDown(XEvent* event)
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window

-        while (widget && !(win = wxGetWindowFromTable(widget)))
+        while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))

             widget = XtParent(widget);
 
         if (!widget || !win)
             widget = XtParent(widget);
 
         if (!widget || !win)


@@ -320,7 +317,7 @@ bool CheckForKeyUp(XEvent* event)
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window
         wxWindow* win = NULL;
 
         // Find the first wxWindow that corresponds to this event window

-        while (widget && !(win = wxGetWindowFromTable(widget)))
+        while (widget && ((win = wxGetWindowFromTable(widget))!=NULL))

                 widget = XtParent(widget);
 
         if (!widget || !win)
                 widget = XtParent(widget);
 
         if (!widget || !win)


@@ -413,7 +410,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
 };
 
     DECLARE_DYNAMIC_CLASS(wxIdlePipeModule)
 };
 

-IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule);
+IMPLEMENT_DYNAMIC_CLASS(wxIdlePipeModule, wxModule)

 
 static void wxInputCallback( XtPointer, int* fd, XtInputId* )
 {
 
 static void wxInputCallback( XtPointer, int* fd, XtInputId* )
 {


@@ -428,8 +425,8 @@ static void wxInputCallback( XtPointer, int* fd, XtInputId* )
         timeout.tv_sec = 0;
         timeout.tv_usec = 0;
 
         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;
 
         if( select( *fd + 1, &in, NULL, NULL, &timeout ) <= 0 )
             break;


@@ -449,8 +446,8 @@ static void wxBreakDispatch()
     timeout.tv_sec = 0;
     timeout.tv_usec = 0;
 
     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;
 
     if( select( idleFds[0] + 1, &in, NULL, NULL, &timeout ) > 0 )
         return;


@@ -475,7 +472,7 @@ bool wxAddIdleCallback()
 {
     if (!wxInitIdleFds())
         return false;
 {
     if (!wxInitIdleFds())
         return false;

-    
+

     // install input handler for wxWakeUpIdle
     XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                   idleFds[0],
     // install input handler for wxWakeUpIdle
     XtAppAddInput((XtAppContext) wxTheApp->GetAppContext(),
                   idleFds[0],