ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Slightly improve keyboard tracking in combobox.

This commit is contained in:
Dmitry Timoshkov 2001-04-16 19:32:19 +00:00 committed by Alexandre Julliard
parent 7c7a3571d4
commit e8ffcaa372
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
controls/listbox.c
View File

@ -753,6 +753,8 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPARAM lParam, BOOL
if (!lParam) if (!lParam)
return strlenW(descr->items[index].str); return strlenW(descr->items[index].str);
TRACE("index %d (0x%04x) %s\n", index, index, debugstr_w(descr->items[index].str));
if(unicode) if(unicode)
{ {
LPWSTR buffer = (LPWSTR)lParam; LPWSTR buffer = (LPWSTR)lParam;
@ -2046,6 +2048,7 @@ static LRESULT LISTBOX_HandleLButtonDownCombo( WND *pWnd, LB_DESCR *pDescr,
if(!PtInRect(&screenRect, screenMousePos)) if(!PtInRect(&screenRect, screenMousePos))
{ {
LISTBOX_SetCaretIndex( pWnd, pDescr, pDescr->lphc->droppedIndex, FALSE );
LISTBOX_SetSelection( pWnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE ); LISTBOX_SetSelection( pWnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE ); COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE );
return 0; return 0;
@ -2745,6 +2748,10 @@ static LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
{ {
INT index; INT index;
LPWSTR textW; LPWSTR textW;
if(HAS_STRINGS(descr))
TRACE("LB_SELECTSTRING: %s\n", unicode ? debugstr_w((LPWSTR)lParam) :
debugstr_a((LPSTR)lParam));
if(unicode || !HAS_STRINGS(descr)) if(unicode || !HAS_STRINGS(descr))
textW = (LPWSTR)lParam; textW = (LPWSTR)lParam;
else else
@ -2758,7 +2765,10 @@ static LRESULT WINAPI ListBoxWndProc_locked( WND* wnd, UINT msg,
if(!unicode && HAS_STRINGS(descr)) if(!unicode && HAS_STRINGS(descr))
HeapFree(GetProcessHeap(), 0, textW); HeapFree(GetProcessHeap(), 0, textW);
if (index != LB_ERR) if (index != LB_ERR)
{
LISTBOX_SetCaretIndex( wnd, descr, index, TRUE );
LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE ); LISTBOX_SetSelection( wnd, descr, index, TRUE, FALSE );
}
return index; return index;
} }
@ -3061,7 +3071,7 @@ static LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
WPARAM wParam, LPARAM lParam, BOOL unicode ) WPARAM wParam, LPARAM lParam, BOOL unicode )
{ {
LRESULT lRet = 0; LRESULT lRet = 0;
HWND hwnd = wnd->hwndSelf; HWND hwnd;
if (wnd) if (wnd)
{ {
@ -3070,6 +3080,8 @@ static LRESULT WINAPI ComboLBWndProc_locked( WND* wnd, UINT msg,
TRACE_(combo)("[%04x]: msg %s wp %08x lp %08lx\n", TRACE_(combo)("[%04x]: msg %s wp %08x lp %08lx\n",
wnd->hwndSelf, SPY_GetMsgName(msg), wParam, lParam ); wnd->hwndSelf, SPY_GetMsgName(msg), wParam, lParam );
hwnd = wnd->hwndSelf;
if( descr || msg == WM_CREATE ) if( descr || msg == WM_CREATE )
{ {
LPHEADCOMBO lphc = (descr) ? descr->lphc : NULL; LPHEADCOMBO lphc = (descr) ? descr->lphc : NULL;