mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #3496 from preco21/master

Browse source 
Update as upstream and some fixes
This commit is contained in:
Cheng Zhao 2015-11-19 10:57:21 +08:00
commit afbceab2ab
13 changed files with 267 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/api/browser-window.md
View file

@ -545,7 +545,7 @@ Enters or leaves the kiosk mode.
Returns whether the window is in kiosk mode.
### `win.hookWindowMessage(message, callback)` _WINDOWS_
### `win.hookWindowMessage(message, callback)` _Windows_
* `message` Integer
* `callback` Function
@ -553,19 +553,19 @@ Returns whether the window is in kiosk mode.
Hooks a windows message. The `callback` is called when
the message is received in the WndProc.
### `win.isWindowMessageHooked(message)` _WINDOWS_
### `win.isWindowMessageHooked(message)` _Windows_
* `message` Integer
Returns `true` or `false` depending on whether the message is hooked.
### `win.unhookWindowMessage(message)` _WINDOWS_
### `win.unhookWindowMessage(message)` _Windows_
* `message` Integer
Unhook the window message.
### `win.unhookAllWindowMessages()` _WINDOWS_
### `win.unhookAllWindowMessages()` _Windows_
Unhooks all of the window messages.