X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9eddec696f06d65a80e7339b2fae14fcb55f8383..675f687593e258dec8fe7a3cad6aef41ac28fc84:/src/common/effects.cpp diff --git a/src/common/effects.cpp b/src/common/effects.cpp index bf68eb4740..fe7a35e25e 100644 --- a/src/common/effects.cpp +++ b/src/common/effects.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/common/effects.cpp -// Purpose: wxEffects implementation +// Purpose: wxEffectsImpl implementation // Author: Julian Smart // Modified by: // Created: 25/4/2000 @@ -22,18 +22,19 @@ #include "wx/dcmemory.h" #include "wx/pen.h" #include "wx/settings.h" + #include "wx/gdicmn.h" #endif //WX_PRECOMP -#include "wx/gdicmn.h" +#if WXWIN_COMPATIBILITY_2_8 /* - * wxEffects: various 3D effects + * wxEffectsImpl: various 3D effects */ -IMPLEMENT_CLASS(wxEffects, wxObject) +IMPLEMENT_CLASS(wxEffectsImpl, wxObject) // Assume system colours -wxEffects::wxEffects() +wxEffectsImpl::wxEffectsImpl() { m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ; m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ; @@ -43,7 +44,7 @@ wxEffects::wxEffects() } // Going from lightest to darkest -wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShadow, +wxEffectsImpl::wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow, const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow) { m_highlightColour = highlightColour; @@ -54,13 +55,13 @@ wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShado } // Draw a sunken edge -void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize)) +void wxEffectsImpl::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(borderSize)) { - wxPen highlightPen(m_highlightColour, 1, wxSOLID); - wxPen lightShadowPen(m_lightShadow, 1, wxSOLID); - wxPen facePen(m_faceColour, 1, wxSOLID); - wxPen mediumShadowPen(m_mediumShadow, 1, wxSOLID); - wxPen darkShadowPen(m_darkShadow, 1, wxSOLID); + wxPen highlightPen(m_highlightColour, 1, wxPENSTYLE_SOLID); + wxPen lightShadowPen(m_lightShadow, 1, wxPENSTYLE_SOLID); + wxPen facePen(m_faceColour, 1, wxPENSTYLE_SOLID); + wxPen mediumShadowPen(m_mediumShadow, 1, wxPENSTYLE_SOLID); + wxPen darkShadowPen(m_darkShadow, 1, wxPENSTYLE_SOLID); //// LEFT AND TOP // Draw a medium shadow pen on left and top, followed by dark shadow line to @@ -87,16 +88,15 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(border dc.SetPen(wxNullPen); } -bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap) +bool wxEffectsImpl::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()); @@ -104,7 +104,7 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap) } #endif // wxUSE_PALETTE - dcMem.SelectObject(bitmap); + dcMem.SelectObjectAsSource(bitmap); int i, j; for (i = rect.x; i < rect.x + rect.width; i += w) @@ -124,3 +124,6 @@ bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, const wxBitmap& bitmap) return true; } + +#endif // WXWIN_COMPATIBILITY_2_8 +