and now fixes for compilation with wxUSE_PALETTE=1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-25 00:53:53 +00:00
parent 9a9045a9f3
commit faa1ae782d

View File

@@ -908,7 +908,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
wxPalette *pal = bmp.GetPalette();
if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
{
oldPal = ::SelectPalette( hdcMem, GetHpalette(pal), FALSE);
oldPal = ::SelectPalette(hdcMem, GetHpaletteOf(pal), FALSE);
::RealizePalette(hdcMem);
}
#endif // wxUSE_PALETTE
@@ -962,8 +962,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
wxPalette *pal = bmp.GetPalette();
if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
{
oldPal = ::SelectPalette( hdcMem, GetHpalette(pal), FALSE);
::RealizePalette(hdcMem);
oldPal = ::SelectPalette(memdc, GetHpaletteOf(pal), FALSE);
::RealizePalette(memdc);
}
#endif // wxUSE_PALETTE