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

comctl32: Fix handling of CB_RESETCONTENT in ComboBoxEx.

This commit is contained in:
Thomas Weidenmueller 2007-11-16 13:49:38 -07:00 committed by Alexandre Julliard
parent 52da1b169a
commit 05a9678d20
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/comctl32/comboex.c
View File

@ -1578,6 +1578,27 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT const *di
} }
static void COMBOEX_ResetContent (COMBOEX_INFO *infoPtr)
{
if (infoPtr->items)
{
CBE_ITEMDATA *item, *next;
item = infoPtr->items;
while (item) {
next = item->next;
COMBOEX_FreeText (item);
Free (item);
item = next;
}
infoPtr->items = 0;
}
infoPtr->selected = -1;
infoPtr->nb_items = 0;
}
static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr) static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr)
{ {
if (infoPtr->hwndCombo) if (infoPtr->hwndCombo)
@ -1586,18 +1607,7 @@ static LRESULT COMBOEX_Destroy (COMBOEX_INFO *infoPtr)
Free (infoPtr->edit); Free (infoPtr->edit);
infoPtr->edit = 0; infoPtr->edit = 0;
if (infoPtr->items) { COMBOEX_ResetContent (infoPtr);
CBE_ITEMDATA *item, *next;
item = infoPtr->items;
while (item) {
next = item->next;
COMBOEX_FreeText (item);
Free (item);
item = next;
}
infoPtr->items = 0;
}
if (infoPtr->defaultFont) if (infoPtr->defaultFont)
DeleteObject (infoPtr->defaultFont); DeleteObject (infoPtr->defaultFont);
@ -2234,12 +2244,15 @@ COMBOEX_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case CB_GETLBTEXTLEN: case CB_GETLBTEXTLEN:
return COMBOEX_GetListboxText(infoPtr, wParam, NULL); return COMBOEX_GetListboxText(infoPtr, wParam, NULL);
case CB_RESETCONTENT:
COMBOEX_ResetContent(infoPtr);
/* fall through */
/* Combo messages we are not sure if we need to process or just forward */ /* Combo messages we are not sure if we need to process or just forward */
case CB_GETDROPPEDCONTROLRECT: case CB_GETDROPPEDCONTROLRECT:
case CB_GETITEMHEIGHT: case CB_GETITEMHEIGHT:
case CB_GETEXTENDEDUI: case CB_GETEXTENDEDUI:
case CB_LIMITTEXT: case CB_LIMITTEXT:
case CB_RESETCONTENT:
case CB_SELECTSTRING: case CB_SELECTSTRING:
/* Combo messages OK to just forward to the regular COMBO */ /* Combo messages OK to just forward to the regular COMBO */