Module: wine Branch: master Commit: cd68aacbbc3e307b5d5c9ed99fb69bf0daf9c4cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd68aacbbc3e307b5d5c9ed99f...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Dec 4 13:38:31 2007 +0100
mshtml: Move HTMLTextContainerEvents connection point to HTMLTextContainer object.
---
dlls/mshtml/htmlbody.c | 3 --- dlls/mshtml/htmltextcont.c | 2 ++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5077638..e3fb732 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -41,7 +41,6 @@ typedef struct { const IHTMLBodyElementVtbl *lpHTMLBodyElementVtbl;
ConnectionPoint cp_propnotif; - ConnectionPoint cp_txtcontevents;
nsIDOMHTMLBodyElement *nsbody; } HTMLBodyElement; @@ -502,8 +501,6 @@ HTMLElement *HTMLBodyElement_Create(nsIDOMHTMLElement *nselem) ret->textcont.element.node.vtbl = &HTMLBodyElementImplVtbl;
ConnectionPoint_Init(&ret->cp_propnotif, &ret->textcont.element.cp_container, &IID_IPropertyNotifySink); - ConnectionPoint_Init(&ret->cp_txtcontevents, &ret->textcont.element.cp_container, - &DIID_HTMLTextContainerEvents);
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLBodyElement, (void**)&ret->nsbody); diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index 8076646..f6f7c8b 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -216,4 +216,6 @@ void HTMLTextContainer_Init(HTMLTextContainer *This) HTMLElement_Init(&This->element);
This->lpHTMLTextContainerVtbl = &HTMLTextContainerVtbl; + + ConnectionPoint_Init(&This->cp, &This->element.cp_container, &DIID_HTMLTextContainerEvents); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b2bba95..8d45752 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -297,6 +297,8 @@ typedef struct { HTMLElement element;
const IHTMLTextContainerVtbl *lpHTMLTextContainerVtbl; + + ConnectionPoint cp; } HTMLTextContainer;
#define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl)