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