X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fea35690f171f9677bd9f949c0af3dc16d1a9576..72da4057731919c6d386aa5a4cf8f3d0258bbe46:/src/common/effects.cpp diff --git a/src/common/effects.cpp b/src/common/effects.cpp index 4439ff42ba..e1d93d144d 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 @@ -26,13 +26,13 @@ #endif //WX_PRECOMP /* - * 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) ; @@ -42,7 +42,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; @@ -53,13 +53,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 @@ -86,7 +86,7 @@ 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) { int w = bitmap.GetWidth(); int h = bitmap.GetHeight();