fixing osx_cocoa

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

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index 15e685dc02c3676dcbf0a0fe1d757f47b58a99d5..f1b9f9d6866143cebb65a45e4a95625fda8f8e79 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -40,7 +40,7 @@ public:
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 

-    void SetStyle(int style)
+    void SetStyle(wxPenStyle style)

     {
         if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT )
         {
     {
         if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT )
         {


@@ -68,10 +68,12 @@ wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)
     m_refData = new wxPenRefData(colour, style);
 }
 
     m_refData = new wxPenRefData(colour, style);
 }
 

-wxPen::wxPen(const wxColour& col, int width, wxBrushStyle style)
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& col, int width, int style)

 {
     m_refData = new wxPenRefData(col, (wxPenStyle)style);
 }
 {
     m_refData = new wxPenRefData(col, (wxPenStyle)style);
 }

+#endif

 
 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {
 
 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {


@@ -153,7 +155,7 @@ wxDash* wxPen::GetDash() const
 
 wxPenCap wxPen::GetCap() const
 {
 
 wxPenCap wxPen::GetCap() const
 {

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

 
     wxFAIL_MSG( "GetCap not implemented" );
     return wxCAP_INVALID;
 
     wxFAIL_MSG( "GetCap not implemented" );
     return wxCAP_INVALID;


@@ -161,7 +163,7 @@ wxPenCap wxPen::GetCap() const
 
 wxPenJoin wxPen::GetJoin() const
 {
 
 wxPenJoin wxPen::GetJoin() const
 {

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

 
     wxFAIL_MSG( "GetJoin not implemented" );
     return wxJOIN_INVALID;
 
     wxFAIL_MSG( "GetJoin not implemented" );
     return wxJOIN_INVALID;


@@ -169,28 +171,28 @@ wxPenJoin wxPen::GetJoin() const
 
 wxPenStyle wxPen::GetStyle() const
 {
 
 wxPenStyle wxPen::GetStyle() const
 {

-    wxCHECK_MSG( Ok(), wxPENSTYLE_MAX, wxT("invalid pen") );
+    wxCHECK_MSG( IsOk(), wxPENSTYLE_INVALID, 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 1;
 }
 
 
     return 1;
 }
 

-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;
 }
 
 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") );

 
     wxFAIL_MSG( "GetStipple not implemented" );
     return NULL;
 
     wxFAIL_MSG( "GetStipple not implemented" );
     return NULL;