ImageList_Remove returns TRUE when removing all images of an empty
ImageList.
This commit is contained in:
parent
e105023871
commit
15fc23693f
|
@ -2292,6 +2292,8 @@ ImageList_Remove (HIMAGELIST himl, INT i)
|
||||||
HDC hdcSrc, hdcDst;
|
HDC hdcSrc, hdcDst;
|
||||||
INT cxNew, nCount;
|
INT cxNew, nCount;
|
||||||
|
|
||||||
|
TRACE("(himl=%p i=%d)\n", himl, i);
|
||||||
|
|
||||||
if (himl == NULL) {
|
if (himl == NULL) {
|
||||||
ERR("Invalid image list handle!\n");
|
ERR("Invalid image list handle!\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -2302,14 +2304,13 @@ ImageList_Remove (HIMAGELIST himl, INT i)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (himl->cCurImage == 0) {
|
|
||||||
ERR("image list is already empty!\n");
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (i == -1) {
|
if (i == -1) {
|
||||||
/* remove all */
|
/* remove all */
|
||||||
TRACE("remove all!\n");
|
if (himl->cCurImage == 0) {
|
||||||
|
/* remove all on empty ImageList is allowed */
|
||||||
|
TRACE("remove all on empty ImageList!\n");
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
himl->cMaxImage = himl->cInitial + himl->cGrow;
|
himl->cMaxImage = himl->cInitial + himl->cGrow;
|
||||||
himl->cCurImage = 0;
|
himl->cCurImage = 0;
|
||||||
|
@ -3051,4 +3052,3 @@ ImageList_Write (HIMAGELIST himl, LPSTREAM pstm)
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue