Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deprecate wxEffects

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-20 21:58:47 +00:00
parent bdee3769af
commit fe1efe6ab7
2 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/effects.h
View File

@@ -13,6 +13,12 @@
#ifndef _WX_EFFECTS_H_ #ifndef _WX_EFFECTS_H_
#define _WX_EFFECTS_H_ #define _WX_EFFECTS_H_
// this class is deprecated and will be removed in the next wx version
//
// please use wxRenderer::DrawBorder() instead of DrawSunkenEdge(); there is no
// replacement for TileBitmap() but it doesn't seem to be very useful anyhow
#ifdef WXWIN_COMPATIBILITY_2_8
/* /*
* wxEffects: various 3D effects * wxEffects: various 3D effects
*/ */
@@ -22,17 +28,15 @@
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dc.h" #include "wx/dc.h"
class WXDLLEXPORT wxEffects: public wxObject class WXDLLEXPORT wxEffectsImpl: public wxObject
{ {
DECLARE_CLASS(wxEffects)
public: public:
// Assume system colours // Assume system colours
wxEffects() ; wxEffectsImpl() ;
// Going from lightest to darkest // Going from lightest to darkest
wxEffects(const wxColour& highlightColour, const wxColour& lightShadow, wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow,
const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& faceColour, const wxColour& mediumShadow,
const wxColour& darkShadow) ; const wxColour& darkShadow) ;
// Accessors // Accessors
wxColour GetHighlightColour() const { return m_highlightColour; } wxColour GetHighlightColour() const { return m_highlightColour; }
@@ -70,6 +74,18 @@ protected:
wxColour m_faceColour; // Usually grey wxColour m_faceColour; // Usually grey
wxColour m_mediumShadow; // Usually dark grey wxColour m_mediumShadow; // Usually dark grey
wxColour m_darkShadow; // Usually black wxColour m_darkShadow; // Usually black
DECLARE_CLASS(wxEffectsImpl)
}; };
#endif // current versions of g++ don't generate deprecation warnings for classes
// declared deprecated, so define wxEffects as a typedef instead: this does
// generate warnings with both g++ and VC (which also has no troubles with
// directly deprecating the classes...)
//
// note that this g++ bug (16370) is supposed to be fixed in g++ 4.3.0
typedef wxEffectsImpl wxDEPRECATED(wxEffects);
#endif // WXWIN_COMPATIBILITY_2_8
#endif // _WX_EFFECTS_H_

14
src/common/effects.cpp
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: src/common/effects.cpp // Name: src/common/effects.cpp
// Purpose: wxEffects implementation // Purpose: wxEffectsImpl implementation
// Author: Julian Smart // Author: Julian Smart
// Modified by: // Modified by:
// Created: 25/4/2000 // Created: 25/4/2000
@@ -26,13 +26,13 @@
#endif //WX_PRECOMP #endif //WX_PRECOMP
/* /*
* wxEffects: various 3D effects * wxEffectsImpl: various 3D effects
*/ */
IMPLEMENT_CLASS(wxEffects, wxObject) IMPLEMENT_CLASS(wxEffectsImpl, wxObject)
// Assume system colours // Assume system colours
wxEffects::wxEffects() wxEffectsImpl::wxEffectsImpl()
{ {
m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ; m_highlightColour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DHILIGHT) ;
m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ; m_lightShadow = wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT) ;
@@ -42,7 +42,7 @@ wxEffects::wxEffects()
} }
// Going from lightest to darkest // 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) const wxColour& faceColour, const wxColour& mediumShadow, const wxColour& darkShadow)
{ {
m_highlightColour = highlightColour; m_highlightColour = highlightColour;
@@ -53,7 +53,7 @@ wxEffects::wxEffects(const wxColour& highlightColour, const wxColour& lightShado
} }
// Draw a sunken edge // 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 highlightPen(m_highlightColour, 1, wxSOLID);
wxPen lightShadowPen(m_lightShadow, 1, wxSOLID); wxPen lightShadowPen(m_lightShadow, 1, wxSOLID);
@@ -86,7 +86,7 @@ void wxEffects::DrawSunkenEdge(wxDC& dc, const wxRect& rect, int WXUNUSED(border
dc.SetPen(wxNullPen); 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 w = bitmap.GetWidth();
int h = bitmap.GetHeight(); int h = bitmap.GetHeight();