From e22c13fe7ed64b4a7cb68ef42b338b6805f9fc64 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 25 Nov 2001 00:22:07 +0000
Subject: [PATCH] fixes for compilation with wxUSE_PALETTE=0

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/splash.cpp | 13 +++++++++----
 src/msw/bitmap.cpp     |  2 ++
 src/msw/dc.cpp         | 34 ++++++++++++++++++++++++++++------
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp
index 06d98a1e2d..144bac6469 100644
--- a/src/generic/splash.cpp
+++ b/src/generic/splash.cpp
@@ -117,11 +117,16 @@ void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.DrawBitmap(m_bitmap, 0, 0);
 }
 
+// VZ: why don't we do it under wxGTK?
+#if !defined(__WXGTK__) && wxUSE_PALETTE
+    #define USE_PALETTE_IN_SPLASH
+#endif
+
 static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
 {
     wxMemoryDC dcMem;
 
-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH
     bool hiColour = (wxDisplayDepth() >= 16) ;
 
     if (bitmap.GetPalette() && !hiColour)
@@ -129,19 +134,19 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
         dc.SetPalette(* bitmap.GetPalette());
         dcMem.SetPalette(* bitmap.GetPalette());
     }
-#endif
+#endif // USE_PALETTE_IN_SPLASH
 
     dcMem.SelectObject(bitmap);
     dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
     dcMem.SelectObject(wxNullBitmap);
 
-#ifndef __WXGTK__
+#ifdef USE_PALETTE_IN_SPLASH
     if (bitmap.GetPalette() && !hiColour)
     {
         dc.SetPalette(wxNullPalette);
         dcMem.SetPalette(wxNullPalette);
     }
-#endif
+#endif // USE_PALETTE_IN_SPLASH
 }
 
 void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)
diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 717fc89c3e..9f62b5e7c0 100644
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -431,8 +431,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
     if (depth == -1) depth = wxDisplayDepth();
     SetDepth( depth );
 
+#if wxUSE_PALETTE
     // Copy the palette from the source image
     SetPalette(image.GetPalette());
+#endif // wxUSE_PALETTE
 
     // create a DIB header
     int headersize = sizeof(BITMAPINFOHEADER);
diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index dcf230b0b6..23c3da77ec 100644
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -868,7 +868,10 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
         height = bmp.GetHeight();
 
     HBITMAP hbmpMask = 0;
+
+#if wxUSE_PALETTE
     HPALETTE oldPal = 0;
+#endif // wxUSE_PALETTE
 
     if ( useMask )
     {
@@ -900,16 +903,26 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
             HDC cdc = GetHdc();
             HDC hdcMem = ::CreateCompatibleDC(GetHdc());
             ::SelectObject(hdcMem, GetHbitmapOf(bmp));
-            if (bmp.GetPalette() && (::GetDeviceCaps(cdc,BITSPIXEL) <= 8)) {
-                oldPal = ::SelectPalette( hdcMem, (HPALETTE)bmp.GetPalette()->GetHPALETTE(), FALSE);
+
+#if wxUSE_PALETTE
+            wxPalette *pal = bmp.GetPalette();
+            if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+            {
+                oldPal = ::SelectPalette( hdcMem, GetHpalette(pal), FALSE);
                 ::RealizePalette(hdcMem);
-                }
+            }
+#endif // wxUSE_PALETTE
+
             ok = ::MaskBlt(cdc, x, y, width, height,
                             hdcMem, 0, 0,
                             hbmpMask, 0, 0,
                             MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
+
+#if wxUSE_PALETTE
             if (oldPal)
                 ::SelectPalette(hdcMem, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
             ::DeleteDC(hdcMem);
         }
 
@@ -945,14 +958,23 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
             ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
         }
 
-        if (bmp.GetPalette() && (::GetDeviceCaps(cdc,BITSPIXEL) <= 8)) {
-            oldPal = ::SelectPalette( memdc, (HPALETTE)bmp.GetPalette()->GetHPALETTE(), FALSE);
-            ::RealizePalette(memdc);
+#if wxUSE_PALETTE
+            wxPalette *pal = bmp.GetPalette();
+            if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
+            {
+                oldPal = ::SelectPalette( hdcMem, GetHpalette(pal), FALSE);
+                ::RealizePalette(hdcMem);
             }
+#endif // wxUSE_PALETTE
+
         ::SelectObject( memdc, hbitmap );
         ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);
+
+#if wxUSE_PALETTE
         if (oldPal)
             ::SelectPalette(memdc, oldPal, FALSE);
+#endif // wxUSE_PALETTE
+
         ::DeleteDC( memdc );
 
         ::SetTextColor(GetHdc(), old_textground);