fixed bug in wxHtmlHelpFrame: didn't show HTML window when navigation panel was off

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9d45e90a6d90aec068b3028b8f613963e186713f..6520be3a916ee0777398a6b89d6867d1d5796107 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,19 +445,21 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
     
     return TRUE;
 }
+#endif
+    // wxUSE_NANOX
 
 //-----------------------------------------------------------------------
-// Processes an X event.
+// Processes an X event, returning TRUE if the event was processed.
 //-----------------------------------------------------------------------
 
-void wxApp::ProcessXEvent(WXEvent* _event)
+bool wxApp::ProcessXEvent(WXEvent* _event)
 {
     XEvent* event = (XEvent*) _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,12 +470,16 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     if (!win)
            return;
 
+#ifdef __WXDEBUG__
+    wxString windowClass = win->GetClassInfo()->GetClassName();
+#endif
+    
     switch (event->type)
     {
         case KeyPress:
         {
             if (!win->IsEnabled())
-                return;
+                return FALSE;
 
             wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
             wxTranslateKeyEvent(keyEvent, win, window, event);
@@ -482,20 +491,20 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
             {
                 keyEvent.SetEventType(wxEVT_CHAR);
-                win->GetEventHandler()->ProcessEvent( keyEvent );
+                if (!win->GetEventHandler()->ProcessEvent( keyEvent ))
+                    return FALSE;
             }
-            return;
+            return TRUE;
         }
         case KeyRelease:
         {
             if (!win->IsEnabled())
-                return;
+                return FALSE;
 
             wxKeyEvent keyEvent(wxEVT_KEY_UP);
             wxTranslateKeyEvent(keyEvent, win, window, event);
         
-            win->GetEventHandler()->ProcessEvent( keyEvent );
-            return;
+            return win->GetEventHandler()->ProcessEvent( keyEvent );
         }
         case ConfigureNotify:
         {
@@ -503,22 +512,25 @@ 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 );
+                return win->GetEventHandler()->ProcessEvent( sizeEvent );
             }
+            return FALSE;
+            break;
         }
 #if !wxUSE_NANOX
         case PropertyNotify:
         {
-            HandlePropertyChange(_event);
-            return;
+            //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
+            return HandlePropertyChange(_event);
         }
         case ClientMessage:
         {
             if (!win->IsEnabled())
-                return;
+                return FALSE;
 
             Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
             Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);
@@ -528,9 +540,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
                 {
                     win->Close(FALSE);
+                    return TRUE;
                 }
             }
-            return;
+            return FALSE;
         }
         case ResizeRequest:
         {
@@ -552,10 +565,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 wxSizeEvent sizeEvent(sz, win->GetId());
                 sizeEvent.SetEventObject(win);
 
-                win->GetEventHandler()->ProcessEvent( sizeEvent );
+                return win->GetEventHandler()->ProcessEvent( sizeEvent );
             }
 
-            return;
+            return FALSE;
         }
 #endif
 #if wxUSE_NANOX
@@ -564,12 +577,15 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             if (win)
             {
                 win->Close(FALSE);
+                return TRUE;
             }
+            return FALSE;
             break;
         }
 #endif
         case Expose:
         {
+            //wxLogDebug("Expose: %s", windowClass.c_str());
             win->GetUpdateRegion().Union( XExposeEventGetX(event), XExposeEventGetY(event),
                                           XExposeEventGetWidth(event), XExposeEventGetHeight(event));
                                               
@@ -594,7 +610,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
             win->SendEraseEvents();
 
-            return;
+            return TRUE;
         }
 #if !wxUSE_NANOX
         case GraphicsExpose:
@@ -615,7 +631,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 win->SendEraseEvents();
             }
 
-            return;
+            return TRUE;
         }
 #endif
         case EnterNotify:
@@ -625,7 +641,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         case MotionNotify:
         {
             if (!win->IsEnabled())
-                return;
+                return FALSE;
                 
             // Here we check if the top level window is
             // disabled, which is one aspect of modality.
@@ -633,25 +649,33 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             while (tlw && !tlw->IsTopLevel())
                 tlw = tlw->GetParent();
             if (tlw && !tlw->IsEnabled())
-                return;
-            
+                return FALSE;
+                
             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();
+                    return TRUE;
                 }
             }
-
+            
+#if !wxUSE_NANOX
+            if (event->type == LeaveNotify || event->type == EnterNotify)
+            {
+                // Throw out NotifyGrab and NotifyUngrab
+                if (event->xcrossing.mode != NotifyNormal)
+                    return FALSE;
+            }
+#endif
             wxMouseEvent wxevent;
             wxTranslateMouseEvent(wxevent, win, window, event);
-            win->GetEventHandler()->ProcessEvent( wxevent );
-            return;
+            return win->GetEventHandler()->ProcessEvent( wxevent );
         }
         case FocusIn:
             {
@@ -667,8 +691,9 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                     focusEvent.SetWindow( g_prevFocus );
                     g_prevFocus = NULL;
                     
-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);
                 }
+                return FALSE;
                 break;
             }
         case FocusOut:
@@ -684,8 +709,9 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                     focusEvent.SetEventObject(win);
                     focusEvent.SetWindow( g_nextFocus );
                     g_nextFocus = NULL;
-                    win->GetEventHandler()->ProcessEvent(focusEvent);
+                    return win->GetEventHandler()->ProcessEvent(focusEvent);
                 }
+                return FALSE;
                 break;
             }
 #ifndef wxUSE_NANOX
@@ -693,6 +719,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             {
                 // Do we want to process this (for top-level windows)?
                 // But we want to be able to veto closes, anyway
+                return FALSE;
                 break;
             }
 #endif
@@ -702,9 +729,11 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             //wxString eventName = wxGetXEventName(XEvent& event);
             //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
 #endif
+            return FALSE;
             break;
         }
     }
+    return FALSE;
 }
 
 // Returns TRUE if more time is needed.
@@ -739,11 +768,12 @@ void wxApp::Dispatch()
 
 // This should be redefined in a derived class for
 // handling property change events for XAtom IPC.
-void wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *event)
 {
     // by default do nothing special
     // TODO: what to do for X11
     // XtDispatchEvent((XEvent*) event);
+    return FALSE;
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)