From eeb1a52854aab6aa805bbcfa42e58b4ee045e537 Mon Sep 17 00:00:00 2001
From: "locka%iol.ie" <locka%iol.ie@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 26 Jul 2000 22:45:22 +0000
Subject: [PATCH] Fixed for windowless controls attempting to get a DC from the
 ActiveX plugin

git-svn-id: svn://10.0.0.236/trunk@74841 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../embedding/browser/activex/src/control/ControlSite.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/mozilla/embedding/browser/activex/src/control/ControlSite.cpp b/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
index fc73f5eb476..4875afa37a4 100644
--- a/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
+++ b/mozilla/embedding/browser/activex/src/control/ControlSite.cpp
@@ -731,7 +731,13 @@ HRESULT STDMETHODCALLTYPE CControlSite::GetDC(/* [in] */ LPCRECT pRect, /* [in]
 		return E_INVALIDARG;
 	}
 
-	// Can't do nested painting
+    if (grfFlags & OLEDC_NODRAW)
+    {
+        *phDC = m_hDCBuffer;
+        return S_OK;
+    }
+   
+   	// Can't do nested painting
 	if (m_hDCBuffer != NULL)
 	{
 		return E_UNEXPECTED;