Support using GetTextExtent() with empty string to get descent in wxOSX.

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

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 53069c51e5d05d10f352dc47af0be9abf563f6fb..9210013b1f1a8234119e8e1c8838727fc4acf784 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -32,15 +32,14 @@ enum wxPenStyle
     wxPENSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
     wxPENSTYLE_STIPPLE = wxSTIPPLE,
 
     wxPENSTYLE_STIPPLE_MASK = wxSTIPPLE_MASK,
     wxPENSTYLE_STIPPLE = wxSTIPPLE,
 

-    wxPENSTYLE_BDIAGONAL_HATCH = wxBDIAGONAL_HATCH,
-    wxPENSTYLE_CROSSDIAG_HATCH = wxCROSSDIAG_HATCH,
-    wxPENSTYLE_FDIAGONAL_HATCH = wxFDIAGONAL_HATCH,
-    wxPENSTYLE_CROSS_HATCH = wxCROSS_HATCH,
-    wxPENSTYLE_HORIZONTAL_HATCH = wxHORIZONTAL_HATCH,
-    wxPENSTYLE_VERTICAL_HATCH = wxVERTICAL_HATCH,
-
-    wxPENSTYLE_FIRST_HATCH = wxFIRST_HATCH,
-    wxPENSTYLE_LAST_HATCH = wxLAST_HATCH
+    wxPENSTYLE_BDIAGONAL_HATCH = wxHATCHSTYLE_BDIAGONAL,
+    wxPENSTYLE_CROSSDIAG_HATCH = wxHATCHSTYLE_CROSSDIAG,
+    wxPENSTYLE_FDIAGONAL_HATCH = wxHATCHSTYLE_FDIAGONAL,
+    wxPENSTYLE_CROSS_HATCH = wxHATCHSTYLE_CROSS,
+    wxPENSTYLE_HORIZONTAL_HATCH = wxHATCHSTYLE_HORIZONTAL,
+    wxPENSTYLE_VERTICAL_HATCH = wxHATCHSTYLE_VERTICAL,
+    wxPENSTYLE_FIRST_HATCH = wxHATCHSTYLE_FIRST,
+    wxPENSTYLE_LAST_HATCH = wxHATCHSTYLE_LAST

 };
 
 enum wxPenJoin
 };
 
 enum wxPenJoin


@@ -85,32 +84,36 @@ public:
     virtual int GetWidth() const = 0;
     virtual int GetDashes(wxDash **ptr) const = 0;
 
     virtual int GetWidth() const = 0;
     virtual int GetDashes(wxDash **ptr) const = 0;
 

-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
+    // 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__)
-#include "wx/msw/pen.h"
+#if defined(__WXMSW__)
+    #include "wx/msw/pen.h"

 #elif defined(__WXMOTIF__) || defined(__WXX11__)
 #elif defined(__WXMOTIF__) || defined(__WXX11__)

-#include "wx/x11/pen.h"
+    #include "wx/x11/pen.h"

 #elif defined(__WXGTK20__)
 #elif defined(__WXGTK20__)

-#include "wx/gtk/pen.h"
+    #include "wx/gtk/pen.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-#include "wx/gtk1/pen.h"
-#elif defined(__WXMGL__)
-#include "wx/mgl/pen.h"
+    #include "wx/gtk1/pen.h"

 #elif defined(__WXDFB__)
 #elif defined(__WXDFB__)

-#include "wx/dfb/pen.h"
+    #include "wx/dfb/pen.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-#include "wx/osx/pen.h"
+    #include "wx/osx/pen.h"

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-#include "wx/cocoa/pen.h"
+    #include "wx/cocoa/pen.h"

 #elif defined(__WXPM__)
 #elif defined(__WXPM__)

-#include "wx/os2/pen.h"
+    #include "wx/os2/pen.h"

 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase
 #endif
 
 class WXDLLIMPEXP_CORE wxPenList: public wxGDIObjListBase


@@ -140,9 +143,14 @@ extern WXDLLIMPEXP_DATA_CORE(wxPenList*)   wxThePenList;
 // compilers as it compares elements of different enums
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
 
 // 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)
 {
 inline bool operator==(wxPenStyle s, wxDeprecatedGUIConstants t)
 {

-    return wx_static_cast(int, s) == wx_static_cast(int, t);
+    return static_cast<int>(s) == static_cast<int>(t);

 }
 
 inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
 }
 
 inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)


@@ -150,6 +158,8 @@ inline bool operator!=(wxPenStyle s, wxDeprecatedGUIConstants t)
     return !(s == t);
 }
 
     return !(s == t);
 }
 

+#endif // wxCOMPILER_NO_OVERLOAD_ON_ENUM
+

 #endif // FUTURE_WXWIN_COMPATIBILITY_3_0
 
 #endif // _WX_PEN_H_BASE_
 #endif // FUTURE_WXWIN_COMPATIBILITY_3_0
 
 #endif // _WX_PEN_H_BASE_