add comparison operators for wxPen/BrushStyle and wxSOLID/... constants to avoid...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/brush.h b/include/wx/brush.h
index 08fc16b5ffa4d93a1bb5e68141d64c1603f60bce..12fdaf2fac8059e0c53fca2a2fe99d127d66653f 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -96,5 +96,24 @@ public:
 
 extern WXDLLEXPORT_DATA(wxBrushList*)   wxTheBrushList;
 
 
 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_

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 521ed775a385294dbfce52228df9624a58ce09dc..cc8a15291ed5fc76e7d5a7dd84a512bdb5a18f5d 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2083,7 +2083,8 @@ enum wxHitTest
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 
 /*  GDI descriptions */
 /*  ---------------------------------------------------------------------------- */
 

-enum
+/* don't use any elements of this enum in the new code */
+enum wxDeprecatedGUIConstants

 {
     /*  Text font families */
     wxDEFAULT    = 70,
 {
     /*  Text font families */
     wxDEFAULT    = 70,

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 49d75c54587780e55cd01374069b86a5e656cfaa..8b85a101ef9646ebc315bdc3436061491adfbff7 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -132,5 +132,24 @@ public:
 
 extern WXDLLEXPORT_DATA(wxPenList*)   wxThePenList;
 
 
 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_