diff --git a/include/wx/brush.h b/include/wx/brush.h index 13cff58950..1d6b3416b7 100644 --- a/include/wx/brush.h +++ b/include/wx/brush.h @@ -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(s) != static_cast(t); } +#endif // WXWIN_COMPATIBILITY_3_2 + #endif // _WX_BRUSH_H_BASE_ diff --git a/include/wx/font.h b/include/wx/font.h index 0daab9c91e..b3aa02cd1e 100644 --- a/include/wx/font.h +++ b/include/wx/font.h @@ -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(s) == static_cast(t); } @@ -690,4 +692,6 @@ wxDEPRECATED_MSG("use wxFONTWEIGHT_XXX constants") \ inline bool operator!=(wxFontWeight s, wxDeprecatedGUIConstants t) { return static_cast(s) != static_cast(t); } +#endif // WXWIN_COMPATIBILITY_3_2 + #endif // _WX_FONT_H_BASE_ diff --git a/include/wx/pen.h b/include/wx/pen.h index 6ae4df8f62..db76b9641d 100644 --- a/include/wx/pen.h +++ b/include/wx/pen.h @@ -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(s) != static_cast(t); } +#endif // WXWIN_COMPATIBILITY_3_2 + #endif // _WX_PEN_H_BASE_