diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 7721d45905..252a3c8a84 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -127,32 +127,31 @@ bool wxEventLoop::PreProcessMessage(WXMSG *msg)
     wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
     wxWindow *wnd;
 
-	wxWindow* parent = NULL;
-
-	// this might happen if we're in a modeless dialog, or if a wx control has
-	// children which themselves were not created by wx (i.e. wxActiveX control children)
+    // this might happen if we're in a modeless dialog, or if a wx control has
+    // children which themselves were not created by wx (i.e. wxActiveX control children)
     if ( !wndThis )
     {
-        while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
+        while ( hwnd && (::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ))
         {
             hwnd = ::GetParent(hwnd);
 
-			// If the control has a wx parent, break and give the parent a chance
-			// to process the window message
-			wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
-			if (wndThis != NULL)
-				break;
+            // If the control has a wx parent, break and give the parent a chance
+            // to process the window message
+            wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+            if (wndThis != NULL)
+                break;
         }
 
-		if ( !wndThis ){
-			// this may happen if the event occurred in a standard modeless dialog (the
-			// only example of which I know of is the find/replace dialog) - then call
-			// IsDialogMessage() to make TAB navigation in it work
-			
-			// NOTE: IsDialogMessage() just eats all the messages (i.e. returns true for
-			// them) if we call it for the control itself
-			return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
-		}
+        if ( !wndThis )
+        {
+            // this may happen if the event occurred in a standard modeless dialog (the
+            // only example of which I know of is the find/replace dialog) - then call
+            // IsDialogMessage() to make TAB navigation in it work
+
+            // NOTE: IsDialogMessage() just eats all the messages (i.e. returns true for
+            // them) if we call it for the control itself
+            return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+        }
     }
 
     if ( !AllowProcessing(wndThis) )