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

The size of the comctl32 internal bitmaps is 24x24 not 26x26.

Browse Source 
Fixed minor typos.
This commit is contained in:
Francois Gouget 2000-09-24 03:03:22 +00:00 committed by Alexandre Julliard
parent e355ee2df1
commit 17acdf26af
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/comctl32/toolbar.c
View File

@ -1123,10 +1123,13 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpAddBmp->nID & 1) if (lpAddBmp->nID & 1)
{ {
/* large icons */ /* large icons */
/* FIXME: on windows the size of the images is 25x24 but the size of the bitmap
* in rsrc is only 24x24. Fix the bitmap (how?) and then fix this
*/
SendMessageA (hwnd, TB_SETBITMAPSIZE, 0, SendMessageA (hwnd, TB_SETBITMAPSIZE, 0,
MAKELPARAM((WORD)26, (WORD)26)); MAKELPARAM((WORD)24, (WORD)24));
SendMessageA (hwnd, TB_SETBUTTONSIZE, 0, SendMessageA (hwnd, TB_SETBUTTONSIZE, 0,
MAKELPARAM((WORD)33, (WORD)33)); MAKELPARAM((WORD)31, (WORD)30));
} }
else else
{ {
@ -1239,7 +1242,7 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (infoPtr->nNumBitmaps + nButtons != imagecount) if (infoPtr->nNumBitmaps + nButtons != imagecount)
{ {
WARN("Desired images do not match recieved images : Previous image number %i Previous images in list %i added %i expecting total %i, Images in list %i\n", WARN("Desired images do not match received images : Previous image number %i Previous images in list %i added %i expecting total %i, Images in list %i\n",
infoPtr->nNumBitmaps, nCount, imagecount - nCount, infoPtr->nNumBitmaps, nCount, imagecount - nCount,
infoPtr->nNumBitmaps+nButtons,imagecount); infoPtr->nNumBitmaps+nButtons,imagecount);
@ -2815,7 +2818,7 @@ TOOLBAR_SetButtonInfoW (HWND hwnd, WPARAM wParam, LPARAM lParam)
*lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1)); *lpString = COMCTL32_ReAlloc (lpString, sizeof(WCHAR)*(len+1));
#endif #endif
/* this is the ultimate sollution */ /* this is the ultimate solution */
/* Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */ /* Str_SetPtrA (&infoPtr->strings[btnPtr->iString], lptbbi->pszText); */
} }
} }