comctl32/treeview: Simplify WM_CHAR handler.
This commit is contained in:
parent
277c5139d2
commit
1804941797
|
@ -4451,13 +4451,8 @@ TREEVIEW_SelectItem(TREEVIEW_INFO *infoPtr, INT wParam, HTREEITEM item)
|
||||||
*
|
*
|
||||||
* TREEVIEW_ProcessLetterKeys
|
* TREEVIEW_ProcessLetterKeys
|
||||||
*/
|
*/
|
||||||
static INT TREEVIEW_ProcessLetterKeys(
|
static INT TREEVIEW_ProcessLetterKeys(TREEVIEW_INFO *infoPtr, WPARAM charCode, LPARAM keyData)
|
||||||
HWND hwnd, /* handle to the window */
|
|
||||||
WPARAM charCode, /* the character code, the actual character */
|
|
||||||
LPARAM keyData /* key data */
|
|
||||||
)
|
|
||||||
{
|
{
|
||||||
TREEVIEW_INFO *infoPtr;
|
|
||||||
HTREEITEM nItem;
|
HTREEITEM nItem;
|
||||||
HTREEITEM endidx,idx;
|
HTREEITEM endidx,idx;
|
||||||
TVITEMEXW item;
|
TVITEMEXW item;
|
||||||
|
@ -4465,12 +4460,7 @@ static INT TREEVIEW_ProcessLetterKeys(
|
||||||
DWORD timestamp,elapsed;
|
DWORD timestamp,elapsed;
|
||||||
|
|
||||||
/* simple parameter checking */
|
/* simple parameter checking */
|
||||||
if (!hwnd || !charCode || !keyData)
|
if (!charCode || !keyData) return 0;
|
||||||
return 0;
|
|
||||||
|
|
||||||
infoPtr=(TREEVIEW_INFO*)GetWindowLongPtrW(hwnd, 0);
|
|
||||||
if (!infoPtr)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* only allow the valid WM_CHARs through */
|
/* only allow the valid WM_CHARs through */
|
||||||
if (!isalnum(charCode) &&
|
if (!isalnum(charCode) &&
|
||||||
|
@ -5672,7 +5662,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
return TREEVIEW_SortChildrenCB(infoPtr, (LPTVSORTCB)lParam);
|
return TREEVIEW_SortChildrenCB(infoPtr, (LPTVSORTCB)lParam);
|
||||||
|
|
||||||
case WM_CHAR:
|
case WM_CHAR:
|
||||||
return TREEVIEW_ProcessLetterKeys( hwnd, wParam, lParam );
|
return TREEVIEW_ProcessLetterKeys(infoPtr, wParam, lParam);
|
||||||
|
|
||||||
case WM_COMMAND:
|
case WM_COMMAND:
|
||||||
return TREEVIEW_Command(infoPtr, wParam, lParam);
|
return TREEVIEW_Command(infoPtr, wParam, lParam);
|
||||||
|
|
Loading…
Reference in New Issue