diff options
| author | nijtmans <nijtmans> | 2010-03-12 13:02:36 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-03-12 13:02:36 (GMT) |
| commit | 36115ec36c8767cb3043dbbd1846c108ab788e8a (patch) | |
| tree | bb6ddc1254faf5843d0d0c100b1065c508dd0302 /win/tkWinPixmap.c | |
| parent | 94533b37310c2295093ae8d6f8849f99fd783c92 (diff) | |
| download | tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.zip tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.tar.gz tk-36115ec36c8767cb3043dbbd1846c108ab788e8a.tar.bz2 | |
[Bug 2956548] TkpButtonSetDefaults only initializes one button type
Fix various gcc warnings, all backported from Tk 8.6
VC6++ does not have SPI_SETKEYBOARDCUES
Diffstat (limited to 'win/tkWinPixmap.c')
| -rw-r--r-- | win/tkWinPixmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win/tkWinPixmap.c b/win/tkWinPixmap.c index 6e3331e..5d1f54d 100644 --- a/win/tkWinPixmap.c +++ b/win/tkWinPixmap.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinPixmap.c,v 1.7.4.1 2009/04/30 13:48:00 dkf Exp $ + * RCS: @(#) $Id: tkWinPixmap.c,v 1.7.4.2 2010/03/12 13:02:36 nijtmans Exp $ */ #include "tkWinInt.h" @@ -75,7 +75,7 @@ Tk_GetPixmap( if (newTwdPtr->bitmap.handle == NULL) { static int repeatError = 0; - unsigned char *bits = NULL; + void *bits = NULL; BITMAPINFO bitmapInfo; HDC dc; @@ -89,7 +89,7 @@ Tk_GetPixmap( bitmapInfo.bmiHeader.biSizeImage = 0; dc = GetDC(NULL); newTwdPtr->bitmap.handle = CreateDIBSection(dc, &bitmapInfo, - DIB_RGB_COLORS, (void **) &bits, 0, 0); + DIB_RGB_COLORS, &bits, 0, 0); ReleaseDC(NULL, dc); /* |