Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for compilation with wxUSE_PALETTE=0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-25 00:22:07 +00:00
parent 1816a07003
commit e22c13fe7e
3 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/generic/splash.cpp
View File

@@ -117,11 +117,16 @@ void wxSplashScreenWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
dc.DrawBitmap(m_bitmap, 0, 0); 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)) static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x), int WXUNUSED(y))
{ {
wxMemoryDC dcMem; wxMemoryDC dcMem;
#ifndef __WXGTK__ #ifdef USE_PALETTE_IN_SPLASH
bool hiColour = (wxDisplayDepth() >= 16) ; bool hiColour = (wxDisplayDepth() >= 16) ;
if (bitmap.GetPalette() && !hiColour) if (bitmap.GetPalette() && !hiColour)
@@ -129,19 +134,19 @@ static void wxDrawSplashBitmap(wxDC& dc, const wxBitmap& bitmap, int WXUNUSED(x)
dc.SetPalette(* bitmap.GetPalette()); dc.SetPalette(* bitmap.GetPalette());
dcMem.SetPalette(* bitmap.GetPalette()); dcMem.SetPalette(* bitmap.GetPalette());
} }
#endif #endif // USE_PALETTE_IN_SPLASH
dcMem.SelectObject(bitmap); dcMem.SelectObject(bitmap);
dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0); dc.Blit(0, 0, bitmap.GetWidth(), bitmap.GetHeight(), & dcMem, 0, 0);
dcMem.SelectObject(wxNullBitmap); dcMem.SelectObject(wxNullBitmap);
#ifndef __WXGTK__ #ifdef USE_PALETTE_IN_SPLASH
if (bitmap.GetPalette() && !hiColour) if (bitmap.GetPalette() && !hiColour)
{ {
dc.SetPalette(wxNullPalette); dc.SetPalette(wxNullPalette);
dcMem.SetPalette(wxNullPalette); dcMem.SetPalette(wxNullPalette);
} }
#endif #endif // USE_PALETTE_IN_SPLASH
} }
void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event) void wxSplashScreenWindow::OnEraseBackground(wxEraseEvent& event)

2
src/msw/bitmap.cpp
View File

@@ -431,8 +431,10 @@ bool wxBitmap::CreateFromImage( const wxImage& image, int depth )
if (depth == -1) depth = wxDisplayDepth(); if (depth == -1) depth = wxDisplayDepth();
SetDepth( depth ); SetDepth( depth );
#if wxUSE_PALETTE
// Copy the palette from the source image // Copy the palette from the source image
SetPalette(image.GetPalette()); SetPalette(image.GetPalette());
#endif // wxUSE_PALETTE
// create a DIB header // create a DIB header
int headersize = sizeof(BITMAPINFOHEADER); int headersize = sizeof(BITMAPINFOHEADER);

34
src/msw/dc.cpp
View File

@@ -868,7 +868,10 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
height = bmp.GetHeight(); height = bmp.GetHeight();
HBITMAP hbmpMask = 0; HBITMAP hbmpMask = 0;
#if wxUSE_PALETTE
HPALETTE oldPal = 0; HPALETTE oldPal = 0;
#endif // wxUSE_PALETTE
if ( useMask ) if ( useMask )
{ {
@@ -900,16 +903,26 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
HDC cdc = GetHdc(); HDC cdc = GetHdc();
HDC hdcMem = ::CreateCompatibleDC(GetHdc()); HDC hdcMem = ::CreateCompatibleDC(GetHdc());
::SelectObject(hdcMem, GetHbitmapOf(bmp)); ::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); ::RealizePalette(hdcMem);
} }
#endif // wxUSE_PALETTE
ok = ::MaskBlt(cdc, x, y, width, height, ok = ::MaskBlt(cdc, x, y, width, height,
hdcMem, 0, 0, hdcMem, 0, 0,
hbmpMask, 0, 0, hbmpMask, 0, 0,
MAKEROP4(SRCCOPY, DSTCOPY)) != 0; MAKEROP4(SRCCOPY, DSTCOPY)) != 0;
#if wxUSE_PALETTE
if (oldPal) if (oldPal)
::SelectPalette(hdcMem, oldPal, FALSE); ::SelectPalette(hdcMem, oldPal, FALSE);
#endif // wxUSE_PALETTE
::DeleteDC(hdcMem); ::DeleteDC(hdcMem);
} }
@@ -945,14 +958,23 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() ); ::SetBkColor(GetHdc(), m_textBackgroundColour.GetPixel() );
} }
if (bmp.GetPalette() && (::GetDeviceCaps(cdc,BITSPIXEL) <= 8)) { #if wxUSE_PALETTE
oldPal = ::SelectPalette( memdc, (HPALETTE)bmp.GetPalette()->GetHPALETTE(), FALSE); wxPalette *pal = bmp.GetPalette();
::RealizePalette(memdc); if ( pal && ::GetDeviceCaps(cdc,BITSPIXEL) <= 8 )
{
oldPal = ::SelectPalette( hdcMem, GetHpalette(pal), FALSE);
::RealizePalette(hdcMem);
} }
#endif // wxUSE_PALETTE
::SelectObject( memdc, hbitmap ); ::SelectObject( memdc, hbitmap );
::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY); ::BitBlt( cdc, x, y, width, height, memdc, 0, 0, SRCCOPY);
#if wxUSE_PALETTE
if (oldPal) if (oldPal)
::SelectPalette(memdc, oldPal, FALSE); ::SelectPalette(memdc, oldPal, FALSE);
#endif // wxUSE_PALETTE
::DeleteDC( memdc ); ::DeleteDC( memdc );
::SetTextColor(GetHdc(), old_textground); ::SetTextColor(GetHdc(), old_textground);