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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 23c3da77eca43bdec7dd21268312e46e5488bfe3..80668e7755df555a7219fd8de7bd33ca9f569b0e 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -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 )
             {
             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
                 ::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 )
             {
             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
 
             }
 #endif // wxUSE_PALETTE