Remove wrong const from wxMenu::GetMenuItems() documentation.

[wxWidgets.git] / include / wx / pen.h

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 479a9668ea0bb7edd2ed4bba52d35859128da80d..e97559b3056506e57a1197e5521d5419b0e6af80 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -84,11 +84,22 @@ public:
     virtual wxPenCap GetCap() const = 0;
     virtual int GetWidth() const = 0;
     virtual int GetDashes(wxDash **ptr) const = 0;
+
+    // Convenient helpers for testing whether the pen is a transparent one:
+    // unlike GetStyle() == wxPENSTYLE_TRANSPARENT, they work correctly even if
+    // the pen is invalid (they both return false in this case).
+    bool IsTransparent() const
+    {
+        return IsOk() && GetStyle() == wxPENSTYLE_TRANSPARENT;
+    }
+
+    bool IsNonTransparent() const
+    {
+        return IsOk() && GetStyle() != wxPENSTYLE_TRANSPARENT;
+    }
 };
 
-#if defined(__WXPALMOS__)
-    #include "wx/palmos/pen.h"
-#elif defined(__WXMSW__)
+#if defined(__WXMSW__)
     #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__) || defined(__WXX11__)
     #include "wx/x11/pen.h"
@@ -96,8 +107,6 @@ public:
     #include "wx/gtk/pen.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk1/pen.h"
-#elif defined(__WXMGL__)
-    #include "wx/mgl/pen.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
@@ -135,6 +144,11 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
 // compilers as it compares elements of different enums
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
 
+// Unfortunately some compilers have ambiguity issues when enum comparisons are
+// overloaded so we have to disable the overloads in this case, see
+// wxCOMPILER_NO_OVERLOAD_ON_ENUM definition in wx/platform.h for more details.
+#ifndef wxCOMPILER_NO_OVERLOAD_ON_ENUM
+
 inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
 {
     return static_cast<int>(s) == static_cast<int>(t);
@@ -145,6 +159,8 @@ inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
     return !(s == t);
 }
 
+#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
+
 #endif // FUTURE_WXWIN_COMPATIBILITY_3_0
 
 #endif // _WX_PEN_H_BASE_