build fix (looking at buildbot)

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

diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp
index 3ca22f63753a27ae1478abd18b96ce2cc92e24f5..287ed0c02704fb7d9e48d5a4ae03832caa40524a 100644 (file)
--- a/src/msw/brush.cpp
+++ b/src/msw/brush.cpp
@@ -24,11 +24,12 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/brush.h"
+

 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"

-    #include "wx/brush.h"

 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/msw/private.h"


@@ -40,7 +41,7 @@
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 public:
 class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
 {
 public:

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

     wxBrushRefData(const wxBitmap& stipple);
     wxBrushRefData(const wxBrushRefData& data);
     virtual ~wxBrushRefData();
     wxBrushRefData(const wxBitmap& stipple);
     wxBrushRefData(const wxBrushRefData& data);
     virtual ~wxBrushRefData();


@@ -51,17 +52,17 @@ public:
     void Free();
 
     const wxColour& GetColour() const { return m_colour; }
     void Free();
 
     const wxColour& GetColour() const { return m_colour; }

-    int GetStyle() const { return m_style; }
+    wxBrushStyle GetStyle() const { return m_style; }

     wxBitmap *GetStipple() { return &m_stipple; }
 
     void SetColour(const wxColour& colour) { Free(); m_colour = colour; }
     wxBitmap *GetStipple() { return &m_stipple; }
 
     void SetColour(const wxColour& colour) { Free(); m_colour = colour; }

-    void SetStyle(int style) { Free(); m_style = style; }
+    void SetStyle(wxBrushStyle style) { Free(); m_style = style; }

     void SetStipple(const wxBitmap& stipple) { Free(); DoSetStipple(stipple); }
 
 private:
     void DoSetStipple(const wxBitmap& stipple);
 
     void SetStipple(const wxBitmap& stipple) { Free(); DoSetStipple(stipple); }
 
 private:
     void DoSetStipple(const wxBitmap& stipple);
 

-    int           m_style;
+    wxBrushStyle  m_style;

     wxBitmap      m_stipple;
     wxColour      m_colour;
     HBRUSH        m_hBrush;
     wxBitmap      m_stipple;
     wxColour      m_colour;
     HBRUSH        m_hBrush;


@@ -83,7 +84,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
 // wxBrushRefData ctors/dtor
 // ----------------------------------------------------------------------------
 
 // wxBrushRefData ctors/dtor
 // ----------------------------------------------------------------------------
 

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

               : m_colour(colour)
 {
     m_style = style;
               : m_colour(colour)
 {
     m_style = style;


@@ -123,7 +124,7 @@ bool wxBrushRefData::operator==(const wxBrushRefData& data) const
     // don't compare HBRUSHes
     return m_style == data.m_style &&
            m_colour == data.m_colour &&
     // don't compare HBRUSHes
     return m_style == data.m_style &&
            m_colour == data.m_colour &&

-           m_stipple == data.m_stipple;
+           m_stipple.IsSameAs(data.m_stipple);

 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)
 }
 
 void wxBrushRefData::DoSetStipple(const wxBitmap& stipple)


@@ -225,7 +226,7 @@ wxBrush::wxBrush()
 {
 }
 
 {
 }
 

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

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


@@ -243,16 +244,6 @@ wxBrush::~wxBrush()
 // wxBrush house keeping stuff
 // ----------------------------------------------------------------------------
 
 // wxBrush house keeping stuff
 // ----------------------------------------------------------------------------
 

-wxBrush& wxBrush::operator=(const wxBrush& brush)
-{
-    if ( this != &brush )
-    {
-        Ref(brush);
-    }
-
-    return *this;
-}
-

 bool wxBrush::operator==(const wxBrush& brush) const
 {
     const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData;
 bool wxBrush::operator==(const wxBrush& brush) const
 {
     const wxBrushRefData *brushData = (wxBrushRefData *)brush.m_refData;


@@ -261,12 +252,12 @@ bool wxBrush::operator==(const wxBrush& brush) const
     return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;
 }
 
     return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;
 }
 

-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const

 {
     return new wxBrushRefData;
 }
 
 {
     return new wxBrushRefData;
 }
 

-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return new wxBrushRefData(*(const wxBrushRefData *)data);
 }
 {
     return new wxBrushRefData(*(const wxBrushRefData *)data);
 }


@@ -282,9 +273,9 @@ wxColour wxBrush::GetColour() const
     return M_BRUSHDATA->GetColour();
 }
 
     return M_BRUSHDATA->GetColour();
 }
 

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

 {
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+    wxCHECK_MSG( Ok(), wxBRUSHSTYLE_MAX, _T("invalid brush") );

 
     return M_BRUSHDATA->GetStyle();
 }
 
     return M_BRUSHDATA->GetStyle();
 }


@@ -314,14 +305,14 @@ void wxBrush::SetColour(const wxColour& col)
     M_BRUSHDATA->SetColour(col);
 }
 
     M_BRUSHDATA->SetColour(col);
 }
 

-void wxBrush::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
+void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b)

 {
     AllocExclusive();
 
     M_BRUSHDATA->SetColour(wxColour(r, g, b));
 }
 
 {
     AllocExclusive();
 
     M_BRUSHDATA->SetColour(wxColour(r, g, b));
 }
 

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

 {
     AllocExclusive();
 
 {
     AllocExclusive();