AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid warnings in the existing code using such comparisons

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-03-22 03:13:18 +00:00
parent 2ecd1756e4
commit 8907a7e2c0
3 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/wx/brush.h
View File

@ -96,5 +96,24 @@ public:
extern WXDLLEXPORT_DATA(wxBrushList*) wxTheBrushList;
#endif
// _WX_BRUSH_H_BASE_
// provide comparison operators to allow code such as
//
// if ( brush.GetStyle() == wxTRANSPARENT )
//
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if FUTURE_WXWIN_COMPATIBILITY_3_0
inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
{
return wx_static_cast(int, s) == wx_static_cast(int, t);
}
inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
{
return !(s == t);
}
#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
#endif // _WX_BRUSH_H_BASE_

3
include/wx/defs.h
View File

@ -2083,7 +2083,8 @@ enum wxHitTest
/* GDI descriptions */
/* ---------------------------------------------------------------------------- */
enum
/* don't use any elements of this enum in the new code */
enum wxDeprecatedGUIConstants
{
/* Text font families */
wxDEFAULT = 70,

23
include/wx/pen.h
View File

@ -132,5 +132,24 @@ public:
extern WXDLLEXPORT_DATA(wxPenList*) wxThePenList;
#endif
// _WX_PEN_H_BASE_
// provide comparison operators to allow code such as
//
// if ( pen.GetStyle() == wxTRANSPARENT )
//
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if FUTURE_WXWIN_COMPATIBILITY_3_0
inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
{
return wx_static_cast(int, s) == wx_static_cast(int, t);
}
inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
{
return !(s == t);
}
#endif // FUTURE_WXWIN_COMPATIBILITY_3_0
#endif // _WX_PEN_H_BASE_