Jacek Caban : mshtml: Call set_ns_editmode in better place.
Alexandre Julliard
julliard at winehq.org
Mon Aug 3 11:14:19 CDT 2009
Module: wine
Branch: master
Commit: 8809bef4280a1b98996825a83e2a7f9a5802fd0a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8809bef4280a1b98996825a83e2a7f9a5802fd0a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sun Aug 2 00:12:29 2009 +0200
mshtml: Call set_ns_editmode in better place.
---
dlls/mshtml/olecmd.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c
index a122e0c..a8d3e6a 100644
--- a/dlls/mshtml/olecmd.c
+++ b/dlls/mshtml/olecmd.c
@@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS));
}
- if(This->nscontainer)
- set_ns_editmode(This->nscontainer);
-
update_doc(This, UPDATE_UI);
if(This->mon) {
@@ -610,12 +607,17 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
return hres;
if(This->ui_active) {
- RECT rcBorderWidths;
-
if(This->ip_window)
call_set_active_object(This->ip_window, NULL);
if(This->hostui)
IDocHostUIHandler_HideUI(This->hostui);
+ }
+
+ if(This->nscontainer)
+ set_ns_editmode(This->nscontainer);
+
+ if(This->ui_active) {
+ RECT rcBorderWidths;
if(This->hostui)
IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),
More information about the wine-cvs
mailing list