COMCTL32: Minor corrections

Filip Navara xnavara at volny.cz
Sat Dec 4 17:55:04 CST 2004


Robert Shearman wrote:

> Filip Navara wrote:
>
>> -  /* use DrawEdge to adjust the size of rcEdge to get rcDraw */
>>   memcpy((&infoPtr->rcDraw), (&infoPtr->rcClient), 
>> sizeof(infoPtr->rcDraw));
>>
>> -  DrawEdge(NULL, &(infoPtr->rcDraw), EDGE_SUNKEN, BF_RECT | BF_ADJUST);
>> +  /* subract the size of the edge drawn by DrawEdge */
>> +  InflateRect(&infoPtr->rcDraw, -2, -2);
>
> Please use GetSystemMetrics(SM_CXEDGE) and GetSystemMetrics(SM_CYEDGE).

I wanted to do that, but the DrawEdge code uses "1" and "-1" so I 
modified the code to match it.

>> --- lib/comctl32/tooltips.c    20 Oct 2004 08:36:55 -0000    1.9
>> +++ lib/comctl32/tooltips.c    4 Dec 2004 23:18:56 -0000
>> @@ -2818,7 +2818,7 @@
>> TOOLTIPS_Unregister (void)
>> {
>>     int i;
>> -    for (i = 0; i < TTI_ERROR+1; i++)
>> -        DeleteObject(hTooltipIcons[i]);
>> +    for (i = TTI_INFO; i <= TTI_ERROR; i++)
>> +        DestroyIcon(hTooltipIcons[i]);
>>     UnregisterClassW (TOOLTIPS_CLASSW, NULL);
>> } 
>
> Someone already sent a patch for this (and it is my buggy code, 
> sorry). Not sure why it didn't go in, but it should.

My bad, I missed it.

Regards,
Filip



More information about the wine-devel mailing list