Return raw text, not markup, from wxWebViewWebKit::GetSelectedText().

[wxWidgets.git] / src / osx / pen.cpp

diff --git a/src/osx/pen.cpp b/src/osx/pen.cpp
index e902ada8c6661bc1d1aada7ef04788f3b291d9d2..ec49069ed84d7eff198034606eaa15c8b714b19a 100644 (file)
--- a/src/osx/pen.cpp
+++ b/src/osx/pen.cpp
@@ -151,7 +151,7 @@ wxGDIRefData *wxPen::CreateGDIRefData() const
 
 wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxPen::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxPenRefData(*wx_static_cast(const wxPenRefData *, data));
+    return new wxPenRefData(*static_cast<const wxPenRefData *>(data));

 }
 
 bool wxPen::operator==(const wxPen& pen) const
 }
 
 bool wxPen::operator==(const wxPen& pen) const


@@ -164,50 +164,55 @@ bool wxPen::operator==(const wxPen& pen) const
 
 wxColour wxPen::GetColour() const
 {
 
 wxColour wxPen::GetColour() const
 {

-    wxCHECK_MSG( Ok(), wxNullColour, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid pen") );

 
     return M_PENDATA->m_colour;
 }
 
 int wxPen::GetWidth() const
 {
 
     return M_PENDATA->m_colour;
 }
 
 int wxPen::GetWidth() const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );

 
     return M_PENDATA->m_width;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {
 
     return M_PENDATA->m_width;
 }
 
 wxPenStyle wxPen::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_style;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {
 
     return M_PENDATA->m_style;
 }
 
 wxPenJoin wxPen::GetJoin() const
 {

-    wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxJOIN_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_join;
 }
 
 wxPenCap wxPen::GetCap() const
 {
 
     return M_PENDATA->m_join;
 }
 
 wxPenCap wxPen::GetCap() const
 {

-    wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxCAP_INVALID, wxT("invalid pen") );

 
     return M_PENDATA->m_cap;
 }
 
 int wxPen::GetDashes(wxDash **ptr) const
 {
 
     return M_PENDATA->m_cap;
 }
 
 int wxPen::GetDashes(wxDash **ptr) const
 {

-    wxCHECK_MSG( Ok(), -1, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), -1, wxT("invalid pen") );

 
     *ptr = M_PENDATA->m_dash;
     return M_PENDATA->m_nbDash;
 }
 
 
     *ptr = M_PENDATA->m_dash;
     return M_PENDATA->m_nbDash;
 }
 

+int wxPen::GetDashCount() const
+{
+    return M_PENDATA->m_nbDash;
+}
+

 wxBitmap *wxPen::GetStipple() const
 {
 wxBitmap *wxPen::GetStipple() const
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid pen") );

 
     return &M_PENDATA->m_stipple;
 }
 
     return &M_PENDATA->m_stipple;
 }