2 ===================================================================
3 --- commctrl.c (revision 23123)
4 +++ commctrl.c (working copy)
7 * Draw text with shadow.
9 +int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, const RECT *rect, DWORD dwFlags,
10 -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags,
11 COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset)
13 FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags,
15 ===================================================================
16 --- listview.c (revision 23123)
17 +++ listview.c (working copy)
19 if (himl && lvItem.iImage >= 0 && !IsRectEmpty(&rcIcon))
21 TRACE("iImage=%d\n", lvItem.iImage);
22 + ImageList_Draw(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
23 + (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
24 - ImageList_DrawEx(himl, lvItem.iImage, hdc, rcIcon.left, rcIcon.top,
25 - rcIcon.right - rcIcon.left, rcIcon.bottom - rcIcon.top, infoPtr->clrBk, CLR_DEFAULT,
26 - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL);
29 /* Don't bother painting item being edited */
31 ===================================================================
32 --- propsheet.c (revision 25766)
33 +++ propsheet.c (working copy)
34 @@ -2434,6 +2434,28 @@
39 +EnumChildProc(HWND hwnd, LPARAM lParam)
42 + RealGetWindowClassW(hwnd, szType, 20);
44 + if (strcmpW(szType, WC_EDITW) == 0)
46 + if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd))
54 + EnumChildWindows(hwnd, EnumChildProc, 0);
60 /******************************************************************************
61 * PROPSHEET_SetWizButtons
63 @@ -2456,17 +2478,6 @@
64 EnableWindow(hwndNext, FALSE);
65 EnableWindow(hwndFinish, FALSE);
67 - /* set the default pushbutton to an enabled button */
68 - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH))
69 - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
70 - else if (dwFlags & PSWIZB_NEXT)
71 - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
72 - else if (dwFlags & PSWIZB_BACK)
73 - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0);
75 - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0);
78 if (dwFlags & PSWIZB_BACK)
79 EnableWindow(hwndBack, TRUE);
81 @@ -2496,6 +2507,32 @@
83 else if (!(dwFlags & PSWIZB_DISABLEDFINISH))
84 EnableWindow(hwndFinish, TRUE);
86 + /* set the default pushbutton to an enabled button and give it focus */
87 + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH))
89 + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0);
90 + SetFocus(hwndFinish);
92 + else if (dwFlags & PSWIZB_NEXT)
94 + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0);
97 + else if (dwFlags & PSWIZB_BACK)
99 + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0);
100 + SetFocus(hwndBack);
104 + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0);
105 + SetFocus(GetDlgItem(hwndDlg, IDCANCEL));
108 + /* Now try to find an edit control that deserves focus */
109 + EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0);
113 /******************************************************************************
114 @@ -3555,6 +3558,8 @@
115 * from which to switch to the next page */
116 SendMessageW(hwndTabCtrl, TCM_SETCURSEL, psInfo->active_page, 0);
118 + PROPSHEET_UnChanged(hwnd, (HWND)wParam);
124 ===================================================================
125 --- tooltips.c (revision 25790)
126 +++ tooltips.c (working copy)
127 @@ -2471,7 +2471,34 @@
128 TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
130 FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam);
131 + TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd);
132 + TTTOOL_INFO *toolPtr = infoPtr->tools;
135 + if (lParam == NF_QUERY)
137 + if (toolPtr->bNotifyUnicode)
139 + return NFR_UNICODE;
144 + else if (lParam == NF_REQUERY)
146 + nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT,
147 + (WPARAM)hwnd, (LPARAM)NF_QUERY);
148 + if (nResult == NFR_ANSI) {
149 + toolPtr->bNotifyUnicode = FALSE;
150 + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n");
151 + } else if (nResult == NFR_UNICODE) {
152 + toolPtr->bNotifyUnicode = TRUE;
153 + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n");
155 + TRACE (" -- WM_NOTIFYFORMAT returns: error!\n");
163 ===================================================================
164 --- treeview.c (revision 27134)
165 +++ treeview.c (working copy)
166 @@ -2844,8 +2844,6 @@
170 - TREEVIEW_UpdateScrollBars(infoPtr);
172 if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
174 TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect);