diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /src/w32term.h | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/w32term.h b/src/w32term.h index c79352a8db8..cf6751b7d63 100644 --- a/src/w32term.h +++ b/src/w32term.h | |||
| @@ -547,7 +547,7 @@ do { \ | |||
| 547 | #define WM_APPCOMMAND 0x319 | 547 | #define WM_APPCOMMAND 0x319 |
| 548 | #define GET_APPCOMMAND_LPARAM(lParam) (HIWORD(lParam) & 0x7fff) | 548 | #define GET_APPCOMMAND_LPARAM(lParam) (HIWORD(lParam) & 0x7fff) |
| 549 | #endif | 549 | #endif |
| 550 | #ifndef WM_UNICHAR | 550 | #ifndef WM_UNICHAR |
| 551 | #define WM_UNICHAR 0x109 | 551 | #define WM_UNICHAR 0x109 |
| 552 | #endif | 552 | #endif |
| 553 | #ifndef UNICODE_NOCHAR | 553 | #ifndef UNICODE_NOCHAR |
| @@ -697,3 +697,7 @@ typedef BOOL (WINAPI * AppendMenuW_Proc) ( | |||
| 697 | IN UINT_PTR, | 697 | IN UINT_PTR, |
| 698 | IN LPCWSTR); | 698 | IN LPCWSTR); |
| 699 | 699 | ||
| 700 | extern HWND w32_system_caret_hwnd; | ||
| 701 | extern int w32_system_caret_height; | ||
| 702 | extern int w32_system_caret_x; | ||
| 703 | extern int w32_system_caret_y; | ||