]>
Commit | Line | Data |
---|---|---|
d8621708 | 1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.024 (extra) | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.024 (extra) | |
11 | Problem: Win32: Compiler warnings for typecasts. | |
12 | Solution: Use DWORD instead of WORD. (Walter Briscoe) | |
13 | Files: src/gui_w32.c | |
14 | ||
15 | ||
16 | *** ../vim-6.2.023/src/gui_w32.c Thu Jul 24 21:01:35 2003 | |
17 | --- src/gui_w32.c Sun Jun 22 17:13:50 2003 | |
18 | *************** | |
19 | *** 2097,2103 **** | |
20 | if (menu->children == NULL) | |
21 | menuID = (WORD)(menu->id); | |
22 | else | |
23 | ! menuID = (WORD)((WORD)(menu->submenu_id) | (WORD)0x8000); | |
24 | menuHandle = GetDlgItem(menu->parent->tearoff_handle, menuID); | |
25 | if (menuHandle) | |
26 | EnableWindow(menuHandle, !grey); | |
27 | --- 2097,2103 ---- | |
28 | if (menu->children == NULL) | |
29 | menuID = (WORD)(menu->id); | |
30 | else | |
31 | ! menuID = (WORD)((DWORD)(menu->submenu_id) | (DWORD)0x8000); | |
32 | menuHandle = GetDlgItem(menu->parent->tearoff_handle, menuID); | |
33 | if (menuHandle) | |
34 | EnableWindow(menuHandle, !grey); | |
35 | *************** | |
36 | *** 3107,3113 **** | |
37 | else | |
38 | { | |
39 | len += (int)STRLEN(TEAROFF_SUBMENU_LABEL); | |
40 | ! menuID = (WORD)((WORD)(menu->submenu_id) | (WORD)0x8000); | |
41 | } | |
42 | ||
43 | /* Allocate menu label and fill it in */ | |
44 | --- 3108,3114 ---- | |
45 | else | |
46 | { | |
47 | len += (int)STRLEN(TEAROFF_SUBMENU_LABEL); | |
48 | ! menuID = (WORD)((DWORD)(menu->submenu_id) | (DWORD)0x8000); | |
49 | } | |
50 | ||
51 | /* Allocate menu label and fill it in */ | |
52 | *** ../vim-6.2.023/src/version.c Thu Jul 24 21:05:22 2003 | |
53 | --- src/version.c Thu Jul 24 21:07:09 2003 | |
54 | *************** | |
55 | *** 632,633 **** | |
56 | --- 632,635 ---- | |
57 | { /* Add new patch number below this line */ | |
58 | + /**/ | |
59 | + 24, | |
60 | /**/ | |
61 | ||
62 | -- | |
63 | To keep milk from turning sour: Keep it in the cow. | |
64 | ||
65 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
66 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
67 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
68 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |