X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bd380a3880d5138c8d5af1f3646466fe0f67b14..1bc3fa018039382d373a265f88750f90a10f3623:/src/common/effects.cpp diff --git a/src/common/effects.cpp b/src/common/effects.cpp index af4cb226f4..965c5724ea 100644 --- a/src/common/effects.cpp +++ b/src/common/effects.cpp @@ -54,7 +54,7 @@ wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShado } // Draw a sunken edge -void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int borderSize) +void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize)) { wxPen highlightPen(m_highlightColour, 1, wxSOLID); wxPen lightShadowPen(m_lightShadow, 1, wxSOLID); @@ -93,14 +93,17 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap) int w = bitmap.GetWidth(); int h = bitmap.GetHeight(); - + wxMemoryDC dcMem; - + +#if wxUSE_PALETTE if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(* bitmap.GetPalette()); dcMem.SetPalette(* bitmap.GetPalette()); } +#endif // wxUSE_PALETTE + dcMem.SelectObject(bitmap); int i, j; @@ -111,11 +114,13 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap) } dcMem.SelectObject(wxNullBitmap); +#if wxUSE_PALETTE if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(wxNullPalette); dcMem.SetPalette(wxNullPalette); } +#endif // wxUSE_PALETTE return TRUE; }