/////////////////////////////////////////////////////////////////////////////
-// Name: effects.cpp
-// Purpose: wxEffects implementation
+// Name: src/common/effects.cpp
+// Purpose: wxEffectsImpl implementation
// Author: Julian Smart
// Modified by:
// Created: 25/4/2000
-// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "effects.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#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
+
+#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) ;
}
// 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;
}
// 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
dc.SetPen(wxNullPen);
}
-bool wxEffects::TileBitmap(const wxRect& rect, wxDC& dc, 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());
}
#endif // wxUSE_PALETTE
- dcMem.SelectObject(bitmap);
+ dcMem.SelectObjectAsSource(bitmap);
int i, j;
for (i = rect.x; i < rect.x + rect.width; i += w)
}
#endif // wxUSE_PALETTE
- return TRUE;
+ return true;
}
+
+#endif // WXWIN_COMPATIBILITY_2_8
+