Add some version checks to help compiling on OSX.

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

diff --git a/src/mgl/pen.cpp b/src/mgl/pen.cpp
index 10af3215728c1df9bbf59c54778a0df9fe2e1a6b..25572afe19476bfa75be150159a5730faa0e2426 100644 (file)
--- a/src/mgl/pen.cpp
+++ b/src/mgl/pen.cpp
@@ -68,7 +68,7 @@ wxPenRefData::wxPenRefData()
     m_style = wxPENSTYLE_SOLID;
     m_joinStyle = wxJOIN_ROUND;
     m_capStyle = wxCAP_ROUND;
     m_style = wxPENSTYLE_SOLID;
     m_joinStyle = wxJOIN_ROUND;
     m_capStyle = wxCAP_ROUND;

-    m_dash = (wxDash*) NULL;
+    m_dash = NULL;

     m_countDashes = 0;
 
     int x, y, c;
     m_countDashes = 0;
 
     int x, y, c;


@@ -122,9 +122,9 @@ wxPen::wxPen(const wxColour& colour, int width, int style)
 
 wxPen::wxPen(const wxBitmap& stipple, int width)
 {
 
 wxPen::wxPen(const wxBitmap& stipple, int width)
 {

-    wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );

     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;
 
     m_refData = new wxPenRefData();
     M_PENDATA->m_width = width;


@@ -186,9 +186,9 @@ void wxPen::SetStyle(wxPenStyle style)
 
 void wxPen::SetStipple(const wxBitmap& stipple)
 {
 
 void wxPen::SetStipple(const wxBitmap& stipple)
 {

-    wxCHECK_RET( stipple.Ok(), _T("invalid bitmap") );
+    wxCHECK_RET( stipple.IsOk(), wxT("invalid bitmap") );

     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,
     wxCHECK_RET( stipple.GetWidth() == 8 && stipple.GetHeight() == 8,

-                  _T("stipple bitmap must be 8x8") );
+                  wxT("stipple bitmap must be 8x8") );

 
     AllocExclusive();
     M_PENDATA->m_stipple = stipple;
 
     AllocExclusive();
     M_PENDATA->m_stipple = stipple;


@@ -203,7 +203,7 @@ void wxPen::SetWidth(int width)
 
 int wxPen::GetDashes(wxDash **ptr) const
 {
 
 int wxPen::GetDashes(wxDash **ptr) const
 {

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

 
     *ptr = (wxDash*)M_PENDATA->m_dash;
     return M_PENDATA->m_countDashes;
 
     *ptr = (wxDash*)M_PENDATA->m_dash;
     return M_PENDATA->m_countDashes;


@@ -211,63 +211,63 @@ int wxPen::GetDashes(wxDash **ptr) const
 
 int wxPen::GetDashCount() const
 {
 
 int wxPen::GetDashCount() const
 {

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

 
     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {
 
     return (M_PENDATA->m_countDashes);
 }
 
 wxDash* wxPen::GetDash() const
 {

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

 
     return (wxDash*)M_PENDATA->m_dash;
 }
 
 wxPenCap wxPen::GetCap() const
 {
 
     return (wxDash*)M_PENDATA->m_dash;
 }
 
 wxPenCap wxPen::GetCap() const
 {

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

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

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

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

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

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

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

 
     return M_PENDATA->m_width;
 }
 
 wxColour wxPen::GetColour() const
 {
 
     return M_PENDATA->m_width;
 }
 
 wxColour wxPen::GetColour() const
 {

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

 
     return M_PENDATA->m_colour;
 }
 
 wxBitmap *wxPen::GetStipple() const
 {
 
     return M_PENDATA->m_colour;
 }
 
 wxBitmap *wxPen::GetStipple() const
 {

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

 
     return &(M_PENDATA->m_stipple);
 }
 
 void* wxPen::GetPixPattern() const
 {
 
     return &(M_PENDATA->m_stipple);
 }
 
 void* wxPen::GetPixPattern() const
 {

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

 
     return (void*)&(M_PENDATA->m_pixPattern);
 }
 
     return (void*)&(M_PENDATA->m_pixPattern);
 }