don't include windows.h unless neccessary

[wxWidgets.git] / src / msw / dc.cpp

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 23c3da77eca43bdec7dd21268312e46e5488bfe3..f3d7c453e48e7d46c91b837edc6587c6464ad315 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -49,7 +49,7 @@
 
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 
 
 #include "wx/msw/private.h" // needs to be before #include <commdlg.h>
 

-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 


@@ -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