X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd4e6da0e0abb643e10d3a2c83b063138bec0d69..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/effects.h?ds=sidebyside diff --git a/include/wx/effects.h b/include/wx/effects.h index c36a9fe833..adaf951c10 100644 --- a/include/wx/effects.h +++ b/include/wx/effects.h @@ -5,7 +5,6 @@ // Author: Julian Smart et al // Modified by: // Created: 25/4/2000 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,6 +12,12 @@ #ifndef _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 +#if WXWIN_COMPATIBILITY_2_8 + /* * wxEffects: various 3D effects */ @@ -20,18 +25,17 @@ #include "wx/object.h" #include "wx/colour.h" #include "wx/gdicmn.h" +#include "wx/dc.h" -class WXDLLEXPORT wxEffects: public wxObject +class WXDLLIMPEXP_CORE wxEffectsImpl: public wxObject { -DECLARE_CLASS(wxEffects) - public: // Assume system colours - wxEffects() ; + wxEffectsImpl() ; // Going from lightest to darkest - wxEffects(const wxColour& highlightColour, const wxColour& lightShadow, - const wxColour& faceColour, const wxColour& mediumShadow, - const wxColour& darkShadow) ; + wxEffectsImpl(const wxColour& highlightColour, const wxColour& lightShadow, + const wxColour& faceColour, const wxColour& mediumShadow, + const wxColour& darkShadow) ; // Accessors wxColour GetHighlightColour() const { return m_highlightColour; } @@ -69,6 +73,18 @@ protected: wxColour m_faceColour; // Usually grey wxColour m_mediumShadow; // Usually dark grey 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_