Merge in from trunk r64802 - r68625

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

diff --git a/src/dfb/pen.cpp b/src/dfb/pen.cpp
index 21d36f623ea4f78b155ea7e0cec135aed34a0de3..f1b9f9d6866143cebb65a45e4a95625fda8f8e79 100644 (file)
--- a/src/dfb/pen.cpp
+++ b/src/dfb/pen.cpp
@@ -29,7 +29,7 @@
 class wxPenRefData : public wxGDIRefData
 {
 public:
 class wxPenRefData : public wxGDIRefData
 {
 public:

-    wxPenRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
+    wxPenRefData(const wxColour& clr = wxNullColour, wxPenStyle style = wxPENSTYLE_SOLID)

     {
         m_colour = clr;
         SetStyle(style);
     {
         m_colour = clr;
         SetStyle(style);


@@ -40,18 +40,18 @@ 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 != wxSOLID && style != wxTRANSPARENT )
+        if ( style != wxPENSTYLE_SOLID && style != wxPENSTYLE_TRANSPARENT )

         {
             wxFAIL_MSG( "only wxSOLID and wxTRANSPARENT styles are supported" );
         {
             wxFAIL_MSG( "only wxSOLID and wxTRANSPARENT styles are supported" );

-            style = wxSOLID;
+            style = wxPENSTYLE_SOLID;

         }
 
         m_style = style;
     }
 
         }
 
         m_style = style;
     }
 

-    int            m_style;
+    wxPenStyle     m_style;

     wxColour       m_colour;
 };
 
     wxColour       m_colour;
 };
 


@@ -61,13 +61,20 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
 

-wxPen::wxPen(const wxColour &colour, int width, int style)
+wxPen::wxPen(const wxColour &colour, int width, wxPenStyle style)

 {
     wxASSERT_MSG( width <= 1, "only width=0,1 are supported" );
 
     m_refData = new wxPenRefData(colour, style);
 }
 
 {
     wxASSERT_MSG( width <= 1, "only width=0,1 are supported" );
 
     m_refData = new wxPenRefData(colour, style);
 }
 

+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxPen::wxPen(const wxColour& col, int width, int style)
+{
+    m_refData = new wxPenRefData(col, (wxPenStyle)style);
+}
+#endif
+

 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {
     wxFAIL_MSG( "stipple pens not supported" );
 wxPen::wxPen(const wxBitmap& WXUNUSED(stipple), int WXUNUSED(width))
 {
     wxFAIL_MSG( "stipple pens not supported" );


@@ -98,17 +105,17 @@ void wxPen::SetColour(unsigned char red, unsigned char green, unsigned char blue
     M_PENDATA->m_colour.Set(red, green, blue);
 }
 
     M_PENDATA->m_colour.Set(red, green, blue);
 }
 

-void wxPen::SetCap(int WXUNUSED(capStyle))
+void wxPen::SetCap(wxPenCap WXUNUSED(capStyle))

 {
     wxFAIL_MSG( "SetCap not implemented" );
 }
 
 {
     wxFAIL_MSG( "SetCap not implemented" );
 }
 

-void wxPen::SetJoin(int WXUNUSED(joinStyle))
+void wxPen::SetJoin(wxPenJoin WXUNUSED(joinStyle))

 {
     wxFAIL_MSG( "SetJoin not implemented" );
 }
 
 {
     wxFAIL_MSG( "SetJoin not implemented" );
 }
 

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

 {
     AllocExclusive();
     M_PENDATA->SetStyle(style);
 {
     AllocExclusive();
     M_PENDATA->SetStyle(style);


@@ -146,46 +153,46 @@ wxDash* wxPen::GetDash() const
     return NULL;
 }
 
     return NULL;
 }
 

-int wxPen::GetCap() const
+wxPenCap wxPen::GetCap() const

 {
 {

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

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

-    return -1;
+    return wxCAP_INVALID;

 }
 
 }
 

-int wxPen::GetJoin() const
+wxPenJoin wxPen::GetJoin() const

 {
 {

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

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

-    return -1;
+    return wxJOIN_INVALID;

 }
 
 }
 

-int wxPen::GetStyle() const
+wxPenStyle wxPen::GetStyle() const

 {
 {

-    wxCHECK_MSG( Ok(), -1, 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;