Bug 678474 - activate event is not dispatched when window is disabled; r=karlt
authorTim Taubert <tim.taubert@gmx.de>
Mon, 15 Aug 2011 16:03:35 +0200
changeset 75370 621138727ae41c530c3a9f812bbc93e1164263b8
parent 75291 e32b302039ca255f051f163629f234098c94f84b
child 75371 1608aa3ce9d38ee758d4ac843e125fcdc14b804d
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewerskarlt
bugs678474
milestone8.0a1
Bug 678474 - activate event is not dispatched when window is disabled; r=karlt
widget/src/gtk2/nsWindow.cpp
--- a/widget/src/gtk2/nsWindow.cpp
+++ b/widget/src/gtk2/nsWindow.cpp
@@ -2959,20 +2959,16 @@ nsWindow::OnButtonReleaseEvent(GtkWidget
 
 void
 nsWindow::OnContainerFocusInEvent(GtkWidget *aWidget, GdkEventFocus *aEvent)
 {
     NS_ASSERTION(mWindowType != eWindowType_popup,
                  "Unexpected focus on a popup window");
 
     LOGFOCUS(("OnContainerFocusInEvent [%p]\n", (void *)this));
-    if (!mEnabled) {
-        LOGFOCUS(("Container focus is blocked [%p]\n", (void *)this));
-        return;
-    }
 
     // Unset the urgency hint, if possible
     GtkWidget* top_window = nsnull;
     GetToplevelWidget(&top_window);
     if (top_window && (GTK_WIDGET_VISIBLE(top_window)))
         SetUrgencyHint(top_window, PR_FALSE);
 
     // Return if being called within SetFocus because the focus manager