From 4d6619288063d6ed59804d468d6b5f033dff7cd2 Mon Sep 17 00:00:00 2001 From: "enndeakin@sympatico.ca" Date: Thu, 2 Aug 2007 11:43:31 -0700 Subject: [PATCH] Bug 385535, mac only, views in popups not painted properly, r=mark,sr=roc --- widget/src/cocoa/nsChildView.mm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/widget/src/cocoa/nsChildView.mm b/widget/src/cocoa/nsChildView.mm index e9bcb031716e..ce71e61e6702 100644 --- a/widget/src/cocoa/nsChildView.mm +++ b/widget/src/cocoa/nsChildView.mm @@ -1339,8 +1339,14 @@ NS_IMETHODIMP nsChildView::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStat nsWindowType type; mParentWidget->GetWindowType(type); if (type == eWindowType_popup) { - event->widget = mParentWidget; - kungFuDeathGrip2 = mParentWidget; + // use the parent popup's widget if there is no view + void* clientData = nsnull; + if (event->widget) + event->widget->GetClientData(clientData); + if (!clientData) { + event->widget = mParentWidget; + kungFuDeathGrip2 = mParentWidget; + } } }