Added VC++ project files for remaining Gizmo samples

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9dc4c4243bf980352c384690dd03e7723d7504ee..91b39edbb77f651b598dba815b4149a8b5fd20c9 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -647,23 +647,32 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 tlw = tlw->GetParent();
             if (tlw && !tlw->IsEnabled())
                 return;
                 tlw = tlw->GetParent();
             if (tlw && !tlw->IsEnabled())
                 return;

-            
+                

             if (event->type == ButtonPress)
             {
                 if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
                 {
                     // This might actually be done in wxWindow::SetFocus()
             if (event->type == ButtonPress)
             {
                 if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
                 {
                     // This might actually be done in wxWindow::SetFocus()

-                    // and not here.
+                    // and not here. TODO.

                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
                     
                     win->SetFocus();
                 }
             }
                     g_prevFocus = wxWindow::FindFocus();
                     g_nextFocus = win;
                     
                     win->SetFocus();
                 }
             }

-
+            
+#if !wxUSE_NANOX
+            if (event->type == LeaveNotify || event->type == EnterNotify)
+            {
+                // Throw out NotifyGrab and NotifyUngrab
+                if (event->xcrossing.mode != NotifyNormal)
+                    return;
+            }
+#endif

             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);
             win->GetEventHandler()->ProcessEvent( wxevent );
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);
             win->GetEventHandler()->ProcessEvent( wxevent );

+                

             return;
         }
         case FocusIn:
             return;
         }
         case FocusIn: