diff options
| author | Alexander Gramiak <agrambot@gmail.com> | 2019-05-09 17:13:18 -0600 |
|---|---|---|
| committer | Alexander Gramiak <agrambot@gmail.com> | 2019-05-19 19:50:32 -0600 |
| commit | 06db2a052fb7335185e8d581d245ce214b3bba7c (patch) | |
| tree | e4dc82552110a777a37703dce446b1c632f6e82b /src/w32fns.c | |
| parent | c0e146e4ec266edf348473c3db7ca8d16745f4f7 (diff) | |
| download | emacs-06db2a052fb7335185e8d581d245ce214b3bba7c.tar.gz emacs-06db2a052fb7335185e8d581d245ce214b3bba7c.tar.bz2 emacs-06db2a052fb7335185e8d581d245ce214b3bba7c.zip | |
Introduce Emacs_Cursor typedef
* src/dispextern.h [HAVE_X_WINDOWS]: Define Emacs_Cursor alias. Move
the No_Cursor definition from xterm.h.
(redisplay_interface): Use Emacs_Cursor over Cursor.
* src/nsgui.h:
* src/nsterm.h:
* src/nsterm.m:
* src/w32gui.h:
* src/w32term.c:
* src/xdisp.c:
* src/xterm.c (x_define_frame_cursor): Use Emacs_Cursor over Cursor.
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 2f54bdc1da1..d74e968d379 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2247,15 +2247,15 @@ w32_set_z_group (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) /* Subroutines for creating a frame. */ -Cursor w32_load_cursor (LPCTSTR); +HCURSOR w32_load_cursor (LPCTSTR); -Cursor +HCURSOR w32_load_cursor (LPCTSTR name) { /* Try first to load cursor from application resource. */ - Cursor cursor = LoadImage ((HINSTANCE) GetModuleHandle (NULL), - name, IMAGE_CURSOR, 0, 0, - LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED); + HCURSOR cursor = LoadImage ((HINSTANCE) GetModuleHandle (NULL), + name, IMAGE_CURSOR, 0, 0, + LR_DEFAULTCOLOR | LR_DEFAULTSIZE | LR_SHARED); if (!cursor) { /* Then try to load a shared predefined cursor. */ @@ -5217,7 +5217,7 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_EMACS_SETCURSOR: { - Cursor cursor = (Cursor) wParam; + HCURSOR cursor = (HCURSOR) wParam; f = w32_window_to_frame (dpyinfo, hwnd); if (f && cursor) { |