projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented IsFixedWidth() correctly for MSW
[wxWidgets.git]
/
src
/
msw
/
dibutils.cpp
diff --git
a/src/msw/dibutils.cpp
b/src/msw/dibutils.cpp
index c52aa3bfaa50cae55107d21976b4d7c47a2af497..6ee22bf3042319fadbeb2a968f3f190f656c45ed 100644
(file)
--- a/
src/msw/dibutils.cpp
+++ b/
src/msw/dibutils.cpp
@@
-167,7
+167,7
@@
int wxDibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
bmf.bfReserved1 = 0;
bmf.bfReserved2 = 0;
bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi;
bmf.bfReserved1 = 0;
bmf.bfReserved2 = 0;
bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi;
-#if 1 // defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) ||
defined(wxUSE_NORLANDER_HEADERS)
+#if 1 // defined( __WATCOMC__) || defined(__VISUALC__) || defined(__SC__) || defined(__SALFORDC__) || defined(__MWERKS__) ||
wxUSE_NORLANDER_HEADERS
#define HWRITE_2ND_ARG_TYPE LPCSTR
#else // don't know who needs this...
#define HWRITE_2ND_ARG_TYPE LPBYTE
#define HWRITE_2ND_ARG_TYPE LPCSTR
#else // don't know who needs this...
#define HWRITE_2ND_ARG_TYPE LPBYTE
@@
-321,8
+321,8
@@
PDIB wxDibReadBitmapInfo(HFILE fh)
bi.biSize = sizeof(BITMAPINFOHEADER);
bi.biWidth = (DWORD)bc.bcWidth;
bi.biHeight = (DWORD)bc.bcHeight;
bi.biSize = sizeof(BITMAPINFOHEADER);
bi.biWidth = (DWORD)bc.bcWidth;
bi.biHeight = (DWORD)bc.bcHeight;
- bi.biPlanes =
(UINT
)bc.bcPlanes;
- bi.biBitCount =
(UINT
)bc.bcBitCount;
+ bi.biPlanes =
(WORD
)bc.bcPlanes;
+ bi.biBitCount =
(WORD
)bc.bcBitCount;
bi.biCompression = BI_RGB;
bi.biSizeImage = 0;
bi.biXPelsPerMeter = 0;
bi.biCompression = BI_RGB;
bi.biSizeImage = 0;
bi.biXPelsPerMeter = 0;
@@
-549,7
+549,7
@@
static void xlatClut4(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
#define RLE_EOF 1
#define RLE_JMP 2
#define RLE_EOF 1
#define RLE_JMP 2
-static void xlatRle8(BYTE FAR *pb, DWORD
dwSize
, BYTE FAR *xlat)
+static void xlatRle8(BYTE FAR *pb, DWORD
WXUNUSED(dwSize)
, BYTE FAR *xlat)
{
BYTE cnt;
BYTE b;
{
BYTE cnt;
BYTE b;
@@
-595,7
+595,7
@@
static void xlatRle8(BYTE FAR *pb, DWORD dwSize, BYTE FAR *xlat)
}
}
}
}
-static void xlatRle4(BYTE FAR *
pb, DWORD dwSize, BYTE FAR *xlat
)
+static void xlatRle4(BYTE FAR *
WXUNUSED(pb), DWORD WXUNUSED(dwSize), BYTE FAR *WXUNUSED(xlat)
)
{
}
{
}
@@
-708,7
+708,7
@@
HPALETTE wxMakePalette(const BITMAPINFO FAR* Info, UINT flags)
HPALETTE hPalette;
const RGBQUAD FAR* rgb = Info->bmiColors;
HPALETTE hPalette;
const RGBQUAD FAR* rgb = Info->bmiColors;
- WORD nColors = Info->bmiHeader.biClrUsed;
+ WORD nColors =
(WORD)
Info->bmiHeader.biClrUsed;
if (nColors) {
LOGPALETTE* logPal = (LOGPALETTE*)
new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];
if (nColors) {
LOGPALETTE* logPal = (LOGPALETTE*)
new BYTE[sizeof(LOGPALETTE) + (nColors-1)*sizeof(PALETTEENTRY)];