Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-24 15:45:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Disable wxDeprecatedGUIConstants comparisons without 3.2 compat

Browse Source 
Start preparing for removing these deprecated comparison operators.
This commit is contained in:
Vadim Zeitlin
2024-01-06 02:06:31 +01:00
parent 020f22de15
commit bddd46d343
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/wx/brush.h
+4
View File
@@ -102,6 +102,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList;
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_2
wxDEPRECATED_MSG("use wxBRUSHSTYLE_XXX constants only")
inline bool operator==(wxBrushStyle s, wxDeprecatedGUIConstants t)
{
@@ -114,4 +116,6 @@ inline bool operator!=(wxBrushStyle s, wxDeprecatedGUIConstants t)
return static_cast<int>(s) != static_cast<int>(t);
}
#endif // WXWIN_COMPATIBILITY_3_2
#endif // _WX_BRUSH_H_BASE_
include/wx/font.h
+4
View File
@@ -671,6 +671,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList;
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_2
wxDEPRECATED_MSG("use wxFONTFAMILY_XXX constants") \
inline bool operator==(wxFontFamily s, wxDeprecatedGUIConstants t)
{ return static_cast<int>(s) == static_cast<int>(t); }
@@ -690,4 +692,6 @@ wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \
inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t)
{ return static_cast<int>(s) != static_cast<int>(t); }
#endif // WXWIN_COMPATIBILITY_3_2
#endif // _WX_FONT_H_BASE_
include/wx/pen.h
+4
View File
@@ -133,6 +133,8 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList;
// to compile without warnings which it would otherwise provoke from some
// compilers as it compares elements of different enums
#if WXWIN_COMPATIBILITY_3_2
wxDEPRECATED_MSG("use wxPENSTYLE_XXX constants")
inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
{
@@ -145,4 +147,6 @@ inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
return static_cast<int>(s) != static_cast<int>(t);
}
#endif // WXWIN_COMPATIBILITY_3_2
#endif // _WX_PEN_H_BASE_