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 9d45e90a6d90aec068b3028b8f613963e186713f..91b39edbb77f651b598dba815b4149a8b5fd20c9 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -180,8 +180,10 @@ void wxApp::CleanUp()
 int wxEntryStart( int& argc, char *argv[] )
 {
 #ifdef __WXDEBUG__
+#if !wxUSE_NANOX
     // install the X error handler
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
+#endif
 #endif // __WXDEBUG__
 
     wxString displayName;
@@ -411,6 +413,7 @@ int wxApp::MainLoop()
     return rt;
 }
 
+#if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 //-----------------------------------------------------------------------
@@ -442,6 +445,8 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
     
     return TRUE;
 }
+#endif
+    // wxUSE_NANOX
 
 //-----------------------------------------------------------------------
 // Processes an X event.
@@ -454,7 +459,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     wxWindow* win = NULL;
     Window window = XEventGetWindow(event);
     Window actualWindow = window;
-    
+
     // Find the first wxWindow that corresponds to this event window
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
@@ -465,6 +470,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     if (!win)
            return;
 
+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif
+    
     switch (event->type)
     {
         case KeyPress:
@@ -503,15 +512,18 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             if (event->update.utype == GR_UPDATE_SIZE)
 #endif
             {
+                //wxLogDebug("ConfigureNotify: %s", windowClass.c_str());
                 wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
                 sizeEvent.SetEventObject( win );
                 
                 win->GetEventHandler()->ProcessEvent( sizeEvent );
             }
+            break;
         }
 #if !wxUSE_NANOX
         case PropertyNotify:
         {
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
             HandlePropertyChange(_event);
             return;
         }
@@ -570,6 +582,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 #endif
         case Expose:
         {
+            //wxLogDebug("Expose: %s", windowClass.c_str());
             win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                           XExposeEventGetWidth(event), XExposeEventGetHeight(event));
                                               
@@ -634,23 +647,32 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 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()
-                    // and not here.
+                    // and not here. TODO.
                     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 );
+                
             return;
         }
         case FocusIn: