Mercurial > vim

comparison src/gui_w48.c @ 4238:26e59a39fdd9 v7.3.870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.870 Problem: Compiler warnings when using MingW 4.5.3. Solution: Do not use MAKEINTRESOURCE. Adjust #if. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Tue, 19 Mar 2013 14:48:29 +0100
parents fbadf0f69877
children 04736b4030ec
comparison
equal deleted inserted replaced
4237:6b0aa05d4e7a 4238:26e59a39fdd9
3263 #ifdef FEAT_MOUSESHAPE 3263 #ifdef FEAT_MOUSESHAPE
3264 /* Table for shape IDCs. Keep in sync with the mshape_names[] table in 3264 /* Table for shape IDCs. Keep in sync with the mshape_names[] table in
3265 * misc2.c! */ 3265 * misc2.c! */
3266 static LPCSTR mshape_idcs[] = 3266 static LPCSTR mshape_idcs[] =
3267 { 3267 {
3268 MAKEINTRESOURCE(IDC_ARROW), /* arrow */ 3268 IDC_ARROW, /* arrow */
3269 MAKEINTRESOURCE(0), /* blank */ 3269 MAKEINTRESOURCE(0), /* blank */
3270 MAKEINTRESOURCE(IDC_IBEAM), /* beam */ 3270 IDC_IBEAM, /* beam */
3271 MAKEINTRESOURCE(IDC_SIZENS), /* updown */ 3271 IDC_SIZENS, /* updown */
3272 MAKEINTRESOURCE(IDC_SIZENS), /* udsizing */ 3272 IDC_SIZENS, /* udsizing */
3273 MAKEINTRESOURCE(IDC_SIZEWE), /* leftright */ 3273 IDC_SIZEWE, /* leftright */
3274 MAKEINTRESOURCE(IDC_SIZEWE), /* lrsizing */ 3274 IDC_SIZEWE, /* lrsizing */
3275 MAKEINTRESOURCE(IDC_WAIT), /* busy */ 3275 IDC_WAIT, /* busy */
3276 #ifdef WIN3264 3276 #ifdef WIN3264
3277 MAKEINTRESOURCE(IDC_NO), /* no */ 3277 IDC_NO, /* no */
3278 #else 3278 #else
3279 MAKEINTRESOURCE(IDC_ICON), /* no */ 3279 IDC_ICON, /* no */
3280 #endif 3280 #endif
3281 MAKEINTRESOURCE(IDC_ARROW), /* crosshair */ 3281 IDC_ARROW, /* crosshair */
3282 MAKEINTRESOURCE(IDC_ARROW), /* hand1 */ 3282 IDC_ARROW, /* hand1 */
3283 MAKEINTRESOURCE(IDC_ARROW), /* hand2 */ 3283 IDC_ARROW, /* hand2 */
3284 MAKEINTRESOURCE(IDC_ARROW), /* pencil */ 3284 IDC_ARROW, /* pencil */
3285 MAKEINTRESOURCE(IDC_ARROW), /* question */ 3285 IDC_ARROW, /* question */
3286 MAKEINTRESOURCE(IDC_ARROW), /* right-arrow */ 3286 IDC_ARROW, /* right-arrow */
3287 MAKEINTRESOURCE(IDC_UPARROW), /* up-arrow */ 3287 IDC_UPARROW, /* up-arrow */
3288 MAKEINTRESOURCE(IDC_ARROW) /* last one */ 3288 IDC_ARROW /* last one */
3289 }; 3289 };
3290 3290
3291 void 3291 void
3292 mch_set_mouse_shape(int shape) 3292 mch_set_mouse_shape(int shape)
3293 { 3293 {
3296 if (shape == MSHAPE_HIDE) 3296 if (shape == MSHAPE_HIDE)
3297 ShowCursor(FALSE); 3297 ShowCursor(FALSE);
3298 else 3298 else
3299 { 3299 {
3300 if (shape >= MSHAPE_NUMBERED) 3300 if (shape >= MSHAPE_NUMBERED)
3301 idc = MAKEINTRESOURCE(IDC_ARROW); 3301 idc = IDC_ARROW;
3302 else 3302 else
3303 idc = mshape_idcs[shape]; 3303 idc = mshape_idcs[shape];
3304 #ifdef SetClassLongPtr 3304 #ifdef SetClassLongPtr
3305 SetClassLongPtr(s_textArea, GCLP_HCURSOR, (__int3264)(LONG_PTR)LoadCursor(NULL, idc)); 3305 SetClassLongPtr(s_textArea, GCLP_HCURSOR, (__int3264)(LONG_PTR)LoadCursor(NULL, idc));
3306 #else 3306 #else