X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..cd7d36c065d638f48cff0845a43e35b9ed1e25f6:/src/common/effects.cpp?ds=sidebyside diff --git a/src/common/effects.cpp b/src/common/effects.cpp index 71c183c3a2..e72542ecf4 100644 --- a/src/common/effects.cpp +++ b/src/common/effects.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: effects.cpp +// Name: src/common/effects.cpp // Purpose: wxEffects implementation // Author: Julian Smart // Modified by: @@ -13,15 +13,18 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif -#include "wx/gdicmn.h" -#include "wx/pen.h" -#include "wx/dcmemory.h" -#include "wx/settings.h" #include "wx/effects.h" +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" + #include "wx/pen.h" + #include "wx/settings.h" + #include "wx/gdicmn.h" +#endif //WX_PRECOMP + /* * wxEffects: various 3D effects */ @@ -83,16 +86,15 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(border dc.SetPen(wxNullPen); } -bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, wxBitmap& bitmap) +bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap) { - static bool hiColour = (wxDisplayDepth() >= 16) ; - int w = bitmap.GetWidth(); int h = bitmap.GetHeight(); wxMemoryDC dcMem; #if wxUSE_PALETTE + static bool hiColour = (wxDisplayDepth() >= 16) ; if (bitmap.GetPalette() && !hiColour) { dc.SetPalette(* bitmap.GetPalette());