Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
99e6592c
Commit
99e6592c
authored
Oct 07, 2007
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 09, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Move most code from handle_editor_load to exec_editmode.
parent
fdfa760c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
24 deletions
+29
-24
editor.c
dlls/mshtml/editor.c
+0
-23
olecmd.c
dlls/mshtml/olecmd.c
+29
-1
No files found.
dlls/mshtml/editor.c
View file @
99e6592c
...
...
@@ -505,29 +505,6 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event)
void
handle_edit_load
(
HTMLDocument
*
This
)
{
get_editor_controller
(
This
->
nscontainer
);
if
(
This
->
ui_active
)
{
OLECHAR
wszHTMLDocument
[
30
];
RECT
rcBorderWidths
;
if
(
This
->
ip_window
)
IOleInPlaceUIWindow_SetActiveObject
(
This
->
ip_window
,
NULL
,
NULL
);
if
(
This
->
hostui
)
IDocHostUIHandler_HideUI
(
This
->
hostui
);
if
(
This
->
hostui
)
IDocHostUIHandler_ShowUI
(
This
->
hostui
,
DOCHOSTUITYPE_AUTHOR
,
ACTOBJ
(
This
),
CMDTARGET
(
This
),
This
->
frame
,
This
->
ip_window
);
LoadStringW
(
hInst
,
IDS_HTMLDOCUMENT
,
wszHTMLDocument
,
sizeof
(
wszHTMLDocument
)
/
sizeof
(
WCHAR
));
if
(
This
->
ip_window
)
IOleInPlaceUIWindow_SetActiveObject
(
This
->
ip_window
,
ACTOBJ
(
This
),
wszHTMLDocument
);
memset
(
&
rcBorderWidths
,
0
,
sizeof
(
rcBorderWidths
));
IOleInPlaceFrame_SetBorderSpace
(
This
->
frame
,
&
rcBorderWidths
);
}
}
static
void
set_ns_fontname
(
NSContainer
*
This
,
const
char
*
fontname
)
...
...
dlls/mshtml/olecmd.c
View file @
99e6592c
...
...
@@ -583,7 +583,35 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in,
update_doc
(
This
,
UPDATE_UI
);
return
IPersistMoniker_Load
(
PERSISTMON
(
This
),
TRUE
,
mon
,
NULL
,
0
);
hres
=
IPersistMoniker_Load
(
PERSISTMON
(
This
),
TRUE
,
mon
,
NULL
,
0
);
IMoniker_Release
(
mon
);
if
(
FAILED
(
hres
))
return
hres
;
if
(
This
->
ui_active
)
{
OLECHAR
wszHTMLDocument
[
30
];
RECT
rcBorderWidths
;
if
(
This
->
ip_window
)
IOleInPlaceUIWindow_SetActiveObject
(
This
->
ip_window
,
NULL
,
NULL
);
if
(
This
->
hostui
)
IDocHostUIHandler_HideUI
(
This
->
hostui
);
if
(
This
->
hostui
)
IDocHostUIHandler_ShowUI
(
This
->
hostui
,
DOCHOSTUITYPE_AUTHOR
,
ACTOBJ
(
This
),
CMDTARGET
(
This
),
This
->
frame
,
This
->
ip_window
);
LoadStringW
(
hInst
,
IDS_HTMLDOCUMENT
,
wszHTMLDocument
,
sizeof
(
wszHTMLDocument
)
/
sizeof
(
WCHAR
));
if
(
This
->
ip_window
)
IOleInPlaceUIWindow_SetActiveObject
(
This
->
ip_window
,
ACTOBJ
(
This
),
wszHTMLDocument
);
memset
(
&
rcBorderWidths
,
0
,
sizeof
(
rcBorderWidths
));
IOleInPlaceFrame_SetBorderSpace
(
This
->
frame
,
&
rcBorderWidths
);
}
return
S_OK
;
}
static
HRESULT
exec_htmleditmode
(
HTMLDocument
*
This
,
DWORD
cmdexecopt
,
VARIANT
*
in
,
VARIANT
*
out
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment