Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more mingw32 warnings fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-14 12:02:03 +00:00
parent cd34332fc4
commit a0c3c734d7
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/msw/dibutils.cpp
View File

@@ -78,7 +78,7 @@
/* /*
* Clear the System Palette so that we can ensure an identity palette * Clear the System Palette so that we can ensure an identity palette
* mapping for fast performance. * mapping for fast performance.
*/ */
@@ -102,7 +102,7 @@ void wxClearSystemPalette(void)
UINT nMapped = 0; UINT nMapped = 0;
BOOL bOK = FALSE; BOOL bOK = FALSE;
int nOK = 0; int nOK = 0;
// *** Reset everything in the system palette to black // *** Reset everything in the system palette to black
for(Counter = 0; Counter < 256; Counter++) for(Counter = 0; Counter < 256; Counter++)
{ {
@@ -162,27 +162,26 @@ int wxDibWriteFile(LPTSTR szFile, LPBITMAPINFOHEADER lpbi)
// write file header // write file header
BITMAPFILEHEADER bmf; BITMAPFILEHEADER bmf;
bmf.bfType = 'BM'; bmf.bfType = BFT_BITMAP;
bmf.bfSize = sizeof(bmf) + size; bmf.bfSize = sizeof(bmf) + size;
bmf.bfReserved1 = 0; bmf.bfReserved1 = 0;
bmf.bfReserved2 = 0; bmf.bfReserved2 = 0;
bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi; bmf.bfOffBits = sizeof(bmf) + (char FAR*)(wxDibPtr(lpbi)) - (char FAR*)lpbi;
#if 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__) || defined(wxUSE_NORLANDER_HEADERS)
if (_hwrite(fh, (LPCSTR)(&bmf), sizeof(bmf))<0 || #define HWRITE_2ND_ARG_TYPE LPCSTR
_hwrite(fh, (LPCSTR)lpbi, size)<0) { #else // don't know who needs this...
_lclose(fh); #define HWRITE_2ND_ARG_TYPE LPBYTE
// printf("la regamos1");
return 0;
}
#else
if (_hwrite(fh, (LPBYTE)(&bmf), sizeof(bmf))<0 ||
_hwrite(fh, (LPBYTE)lpbi, size)<0) {
_lclose(fh);
// printf("la regamos1");
return 0;
}
#endif #endif
if ( _hwrite(fh, (HWRITE_2ND_ARG_TYPE)(&bmf), sizeof(bmf)) < 0 ||
_hwrite(fh, (HWRITE_2ND_ARG_TYPE)lpbi, size) < 0 )
{
_lclose(fh);
return 0;
}
#undef HWRITE_2ND_ARG_TYPE
_lclose(fh); _lclose(fh);
return 1; return 1;
} }
@@ -417,7 +416,7 @@ BOOL wxDibSetUsage(PDIB pdib, HPALETTE hpal,UINT wUsage)
return FALSE; return FALSE;
nColors = wxDibNumColors(pdib); nColors = wxDibNumColors(pdib);
if (nColors == 3 && wxDibCompression(pdib) == BI_BITFIELDS) if (nColors == 3 && wxDibCompression(pdib) == BI_BITFIELDS)
nColors = 0; nColors = 0;