introduce wxBrushStyle enum and replace 'int style' occurrences in wxBrush code with...

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

diff --git a/src/dfb/brush.cpp b/src/dfb/brush.cpp
index 6d310fc0bd2c24e7e553c3c67ec2f5ce05fb9bfc..51a295f9979be411cfa4d44f741edc38697abd8f 100644 (file)
--- a/src/dfb/brush.cpp
+++ b/src/dfb/brush.cpp
@@ -29,7 +29,7 @@
 class wxBrushRefData : public wxGDIRefData
 {
 public:
 class wxBrushRefData : public wxGDIRefData
 {
 public:

-    wxBrushRefData(const wxColour& clr = wxNullColour, int style = wxSOLID)
+    wxBrushRefData(const wxColour& clr = wxNullColour, wxBrushStyle style = wxBRUSHSTYLE_SOLID)

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


@@ -43,7 +43,7 @@ public:
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 
 
     virtual bool IsOk() const { return m_colour.IsOk(); }
 

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

     {
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {
     {
         if ( style != wxSOLID && style != wxTRANSPARENT )
         {


@@ -55,7 +55,7 @@ public:
     }
 
     wxColour       m_colour;
     }
 
     wxColour       m_colour;

-    int            m_style;
+    wxBrushStyle   m_style;

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------


@@ -64,7 +64,7 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 

-wxBrush::wxBrush(const wxColour &colour, int style)
+wxBrush::wxBrush(const wxColour &colour, wxBrushStyle style)

 {
     m_refData = new wxBrushRefData(colour, style);
 }
 {
     m_refData = new wxBrushRefData(colour, style);
 }


@@ -82,7 +82,7 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData == brush.m_refData;
 }
 
     return m_refData == brush.m_refData;
 }
 

-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const

 {
     if (m_refData == NULL)
     {
 {
     if (m_refData == NULL)
     {


@@ -122,7 +122,7 @@ void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)
     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 
     M_BRUSHDATA->m_colour.Set(r, g, b);
 }
 

-void wxBrush::SetStyle(int style)
+void wxBrush::SetStyle(wxBrushStyle style)

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