system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup the edit wndproc a bit.

Browse source
This commit is contained in:
Dimitrie O. Paun 2003-11-20 04:19:59 +00:00 committed by Alexandre Julliard
parent e5762652d2
commit 6443ee58bc
1 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dlls/comctl32/treeview.c
View file

@ -3445,31 +3445,23 @@ TREEVIEW_GetEditControl(TREEVIEW_INFO *infoPtr)
static LRESULT CALLBACK
TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
TREEVIEW_INFO *infoPtr;
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
BOOL bCancel = FALSE;
LRESULT rc;
switch (uMsg)
{
case WM_PAINT:
{
LRESULT rc;
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
TRACE("WM_PAINT start\n");
rc = CallWindowProcA(infoPtr->wpEditOrig, hwnd, uMsg, wParam,
TRACE("WM_PAINT start\n");
rc = CallWindowProcA(infoPtr->wpEditOrig, hwnd, uMsg, wParam,
lParam);
TRACE("WM_PAINT done\n");
return rc;
}
TRACE("WM_PAINT done\n");
return rc;
case WM_KILLFOCUS:
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
if (infoPtr->bIgnoreEditKillFocus)
return TRUE;
break;
}
case WM_GETDLGCODE:
return DLGC_WANTARROWS | DLGC_WANTALLKEYS;
@ -3487,18 +3479,12 @@ TREEVIEW_Edit_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
/* fall through */
default:
{
TREEVIEW_INFO *infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
return CallWindowProcA(infoPtr->wpEditOrig, hwnd, uMsg, wParam,
lParam);
}
return CallWindowProcA(infoPtr->wpEditOrig, hwnd, uMsg, wParam, lParam);
}
/* Processing TVN_ENDLABELEDIT message could kill the focus */
/* eg. Using a messagebox */
infoPtr = TREEVIEW_GetInfoPtr(GetParent(hwnd));
infoPtr->bIgnoreEditKillFocus = TRUE;
TREEVIEW_EndEditLabelNow(infoPtr, bCancel || !infoPtr->bLabelChanged);
infoPtr->bIgnoreEditKillFocus = FALSE;
@ -3570,7 +3556,7 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
}
default:
return SendMessageA(GetParent(infoPtr->hwnd), WM_COMMAND, wParam, lParam);
return SendMessageA(infoPtr->hwndNotify, WM_COMMAND, wParam, lParam);
}
return 0;