mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Added specific GDI casts to allow building when STRICT is defined

This commit is contained in:
rpotts%netscape.com 1998-08-29 06:18:17 +00:00
Родитель 9bd53bd53c
Коммит 9c9e610c96
5 изменённых файлов: 23 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
gfx/src/windows/nsBlenderWin.cpp
Просмотреть файл

@ -70,7 +70,7 @@ HBITMAP srcbits,dstbits;
// source
mTempB1 = CreateCompatibleBitmap(srcdc,3,3);
srcbits = ::SelectObject(srcdc, mTempB1);
srcbits = (HBITMAP)::SelectObject(srcdc, mTempB1);
numbytes = ::GetObject(srcbits,sizeof(BITMAP),&mSrcInfo);
BuildDIB(&mSrcbinfo,&mSrcBytes,mSrcInfo.bmWidth,mSrcInfo.bmHeight,mSrcInfo.bmBitsPixel);
numbytes = ::GetDIBits(srcdc,srcbits,0,mSrcInfo.bmHeight,mSrcBytes,(LPBITMAPINFO)mSrcbinfo,DIB_RGB_COLORS);
@ -79,7 +79,7 @@ HBITMAP srcbits,dstbits;
{
// destination
mTempB2 = CreateCompatibleBitmap(dstdc,3,3);
dstbits = ::SelectObject(dstdc, mTempB2);
dstbits = (HBITMAP)::SelectObject(dstdc, mTempB2);
::GetObject(dstbits,sizeof(BITMAP),&mDstInfo);
BuildDIB(&mDstbinfo,&mDstBytes,mDstInfo.bmWidth,mDstInfo.bmHeight,mDstInfo.bmBitsPixel);
numbytes = ::GetDIBits(dstdc,dstbits,0,mDstInfo.bmHeight,mDstBytes,(LPBITMAPINFO)mDstbinfo,DIB_RGB_COLORS);
@ -217,7 +217,7 @@ nsColorMap *colormap;
// put the new bits in
dstdc = ((nsDrawingSurfaceWin *)aDst)->mDC;
dstbits = ::CreateDIBitmap(dstdc, mDstbinfo, CBM_INIT, mDstBytes, (LPBITMAPINFO)mDstbinfo, DIB_RGB_COLORS);
tb1 = ::SelectObject(dstdc,dstbits);
tb1 = (HBITMAP)::SelectObject(dstdc,dstbits);
::DeleteObject(tb1);
}
@ -259,7 +259,7 @@ HBITMAP dstbits, tb1;
// put the new bits in
dstdc = ((nsDrawingSurfaceWin *)aDst)->mDC;
dstbits = ::CreateDIBitmap(dstdc, mDstbinfo, CBM_INIT, mDstBytes, (LPBITMAPINFO)mDstbinfo, DIB_RGB_COLORS);
tb1 = ::SelectObject(dstdc,dstbits);
tb1 = (HBITMAP)::SelectObject(dstdc,dstbits);
::DeleteObject(tb1);
}
return(result);

2
gfx/src/windows/nsDeviceContextWin.cpp
Просмотреть файл

@ -183,7 +183,7 @@ NS_IMETHODIMP nsDeviceContextWin::GetPaletteInfo(nsPaletteInfo& aPaletteInfo)
logPal->palNumEntries = COLOR_CUBE_SIZE + 20;
// Initialize it from the default Windows palette
HPALETTE hDefaultPalette = ::GetStockObject(DEFAULT_PALETTE);
HPALETTE hDefaultPalette = (HPALETTE)::GetStockObject(DEFAULT_PALETTE);
// First ten system colors
::GetPaletteEntries(hDefaultPalette, 0, 10, logPal->palPalEntry);

4
gfx/src/windows/nsFontMetricsWin.cpp
Просмотреть файл

@ -203,7 +203,7 @@ void nsFontMetricsWin::RealizeFont(nsIDeviceContext *aContext)
aContext->GetNativeWidget(widget);
HWND win = (HWND)widget;
HDC dc = ::GetDC(win);
HFONT oldfont = ::SelectObject(dc, (HGDIOBJ) mFontHandle);
HFONT oldfont = (HFONT)::SelectObject(dc, (HGDIOBJ) mFontHandle);
// Get font metrics
float dev2app;
@ -283,7 +283,7 @@ NS_IMETHODIMP nsFontMetricsWin :: GetWidth(nsIDeviceContext *aContext,
aContext->GetNativeWidget(widget);
HWND win = (HWND)widget;
HDC hdc = ::GetDC(win);
HFONT oldfont = ::SelectObject(hdc, (HGDIOBJ) mFontHandle);
HFONT oldfont = (HFONT)::SelectObject(hdc, (HGDIOBJ) mFontHandle);
SIZE size;

12
gfx/src/windows/nsImageWin.cpp
Просмотреть файл

@ -348,13 +348,13 @@ PRBool nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurfa
HBITMAP oldbits;
if (nsnull == mAlphaHBitmap) {
oldbits = ::SelectObject(srcdc, mHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mHBitmap);
::StretchBlt(the_hdc, aDX, aDY, aDWidth, aDHeight, srcdc, aSX, aSY,
aSWidth, aSHeight, SRCCOPY);
}
else if (gIsWinNT && (aDWidth == aSWidth) && (aDHeight == aSHeight))
{
oldbits = ::SelectObject(srcdc, mHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mHBitmap);
::MaskBlt(the_hdc, aDX, aDY, aDWidth, aDHeight,
srcdc, aSX, aSY, mAlphaHBitmap, aSX, aSY, MASKBLT_ROP);
}
@ -362,7 +362,7 @@ PRBool nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurfa
{
COLORREF oldTextColor = ::SetTextColor(the_hdc, RGB(0, 0, 0));
COLORREF oldBkColor = ::SetBkColor(the_hdc, RGB(255, 255, 255));
oldbits = ::SelectObject(srcdc, mAlphaHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mAlphaHBitmap);
::StretchBlt(the_hdc, aDX, aDY, aDWidth, aDHeight, srcdc, aSX, aSY,
aSWidth, aSHeight, SRCAND);
::SetTextColor(the_hdc, oldTextColor);
@ -435,13 +435,13 @@ PRBool nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurfa
if (nsnull == mAlphaHBitmap)
{
oldbits = ::SelectObject(srcdc, mHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mHBitmap);
::StretchBlt(the_hdc, aX, aY, aWidth, aHeight, srcdc, 0, 0,
mBHead->biWidth, mBHead->biHeight, SRCCOPY);
}
else if (gIsWinNT && (aWidth == mBHead->biWidth) && (aHeight == mBHead->biHeight))
{
oldbits = ::SelectObject(srcdc, mHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mHBitmap);
::MaskBlt(the_hdc, aX, aY, aWidth, aHeight,
srcdc, 0, 0, mAlphaHBitmap, 0, 0, MASKBLT_ROP);
}
@ -449,7 +449,7 @@ PRBool nsImageWin :: Draw(nsIRenderingContext &aContext, nsDrawingSurface aSurfa
{
COLORREF oldTextColor = ::SetTextColor(the_hdc, RGB(0, 0, 0));
COLORREF oldBkColor = ::SetBkColor(the_hdc, RGB(255, 255, 255));
oldbits = ::SelectObject(srcdc, mAlphaHBitmap);
oldbits = (HBITMAP)::SelectObject(srcdc, mAlphaHBitmap);
::StretchBlt(the_hdc, aX, aY, aWidth, aHeight, srcdc, 0, 0,
mAlphaWidth, mAlphaHeight, SRCAND);
::SetTextColor(the_hdc, oldTextColor);

20
gfx/src/windows/nsRenderingContextWin.cpp
Просмотреть файл

@ -131,7 +131,7 @@ nsDrawingSurfaceWin :: ~nsDrawingSurfaceWin()
{
if ((nsnull != mDC) && (nsnull != mOrigBitmap))
{
HBITMAP bits = ::SelectObject(mDC, mOrigBitmap);
HBITMAP bits = (HBITMAP)::SelectObject(mDC, mOrigBitmap);
if (nsnull != bits)
::DeleteObject(bits);
@ -196,7 +196,7 @@ nsresult nsDrawingSurfaceWin :: Init(nsIWidget *aOwner)
if (nsnull != mDCOwner)
{
NS_ADDREF(mDCOwner);
mDC = (HWND)mDCOwner->GetNativeData(NS_NATIVE_GRAPHIC);
mDC = (HDC)mDCOwner->GetNativeData(NS_NATIVE_GRAPHIC);
return NS_OK;
}
@ -435,9 +435,9 @@ nsresult nsRenderingContextWin :: SetupDC(HDC aOldDC, HDC aNewDC)
::SelectPalette(aOldDC, mOrigPalette, TRUE);
}
mOrigSolidBrush = ::SelectObject(aNewDC, mBlackBrush);
mOrigFont = ::SelectObject(aNewDC, mDefFont);
mOrigSolidPen = ::SelectObject(aNewDC, mBlackPen);
mOrigSolidBrush = (HBRUSH)::SelectObject(aNewDC, mBlackBrush);
mOrigFont = (HFONT)::SelectObject(aNewDC, mDefFont);
mOrigSolidPen = (HPEN)::SelectObject(aNewDC, mBlackPen);
// If this is a palette device, then select and realize the palette
nsPaletteInfo palInfo;
@ -466,7 +466,7 @@ nsresult nsRenderingContextWin :: CommonInit(void)
mInitialized = PR_TRUE;
#endif
mBlackBrush = ::GetStockObject(BLACK_BRUSH);
mBlackBrush = (HBRUSH)::GetStockObject(BLACK_BRUSH);
mDefFont = ::CreateFont(12, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE,
ANSI_CHARSET, OUT_TT_PRECIS, CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY, FF_ROMAN | VARIABLE_PITCH, "Times New Roman");
@ -818,7 +818,7 @@ nsDrawingSurface nsRenderingContextWin :: CreateDrawingSurface(nsRect *aBounds)
hBits = ::CreateCompatibleBitmap(mDC, 2, 2);
}
surf->mOrigBitmap = ::SelectObject(surf->mDC, hBits);
surf->mOrigBitmap = (HBITMAP)::SelectObject(surf->mDC, hBits);
}
return (nsDrawingSurface)surf;
@ -955,7 +955,7 @@ void nsRenderingContextWin::DrawPolygon(const nsPoint aPoints[], PRInt32 aNumPoi
lb.lbHatch = 0;
SetupSolidPen();
HBRUSH brush = ::CreateBrushIndirect(&lb);
HBRUSH oldBrush = ::SelectObject(mDC, brush);
HBRUSH oldBrush = (HBRUSH)::SelectObject(mDC, brush);
::Polygon(mDC, pp0, int(aNumPoints));
::SelectObject(mDC, oldBrush);
::DeleteObject(brush);
@ -992,7 +992,7 @@ void nsRenderingContextWin::FillPolygon(const nsPoint aPoints[], PRInt32 aNumPoi
if (NULL == mNullPen)
mNullPen = ::CreatePen(PS_NULL, 0, 0);
HPEN oldPen = ::SelectObject(mDC, mNullPen);
HPEN oldPen = (HPEN)::SelectObject(mDC, mNullPen);
::Polygon(mDC, pp0, int(aNumPoints));
::SelectObject(mDC, oldPen);
@ -1011,7 +1011,7 @@ void nsRenderingContextWin :: DrawEllipse(nscoord aX, nscoord aY, nscoord aWidth
mTMatrix->TransformCoord(&aX, &aY, &aWidth, &aHeight);
SetupSolidPen();
HBRUSH oldBrush = ::SelectObject(mDC, ::GetStockObject(NULL_BRUSH));
HBRUSH oldBrush = (HBRUSH)::SelectObject(mDC, ::GetStockObject(NULL_BRUSH));
::Ellipse(mDC, aX, aY, aX + aWidth, aY + aHeight);
::SelectObject(mDC, oldBrush);