// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
-#ifdef __GNUG__
-#pragma implementation "brush.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#pragma hdrstop
#endif
+#include "wx/brush.h"
+
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/app.h"
- #include "wx/brush.h"
+ #include "wx/bitmap.h"
#endif // WX_PRECOMP
#include "wx/msw/private.h"
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();
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; }
- 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);
- int m_style;
+ wxBrushStyle m_style;
wxBitmap m_stipple;
wxColour m_colour;
HBRUSH m_hBrush;
// wxBrushRefData ctors/dtor
// ----------------------------------------------------------------------------
-wxBrushRefData::wxBrushRefData(const wxColour& colour, int style)
+wxBrushRefData::wxBrushRefData(const wxColour& colour, wxBrushStyle style)
: m_colour(colour)
{
m_style = style;
}
wxBrushRefData::wxBrushRefData(const wxBrushRefData& data)
- : m_stipple(data.m_stipple),
+ : wxGDIRefData(),
+ m_stipple(data.m_stipple),
m_colour(data.m_colour)
{
m_style = data.m_style;
// 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)
{
m_stipple = stipple;
- m_style = stipple.GetMask() ? wxSTIPPLE_MASK_OPAQUE : wxSTIPPLE;
+ m_style = stipple.GetMask() ? wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE
+ : wxBRUSHSTYLE_STIPPLE;
}
// ----------------------------------------------------------------------------
}
}
-static int TransllateHatchStyle(int style)
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+
+static int TranslateHatchStyle(int style)
{
switch ( style )
{
-#ifndef __WXMICROWIN__
- case wxBDIAGONAL_HATCH: return HS_BDIAGONAL;
- case wxCROSSDIAG_HATCH: return HS_DIAGCROSS;
- case wxFDIAGONAL_HATCH: return HS_FDIAGONAL;
- case wxCROSS_HATCH: return HS_CROSS;
- case wxHORIZONTAL_HATCH:return HS_HORIZONTAL;
- case wxVERTICAL_HATCH: return HS_VERTICAL;
-#endif // __WXMICROWIN__
+ case wxBRUSHSTYLE_BDIAGONAL_HATCH: return HS_BDIAGONAL;
+ case wxBRUSHSTYLE_CROSSDIAG_HATCH: return HS_DIAGCROSS;
+ case wxBRUSHSTYLE_FDIAGONAL_HATCH: return HS_FDIAGONAL;
+ case wxBRUSHSTYLE_CROSS_HATCH: return HS_CROSS;
+ case wxBRUSHSTYLE_HORIZONTAL_HATCH:return HS_HORIZONTAL;
+ case wxBRUSHSTYLE_VERTICAL_HATCH: return HS_VERTICAL;
default: return -1;
}
}
+#endif // !__WXMICROWIN__ && !__WXWINCE__
+
HBRUSH wxBrushRefData::GetHBRUSH()
{
if ( !m_hBrush )
{
- int hatchStyle = TransllateHatchStyle(m_style);
+#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+ int hatchStyle = TranslateHatchStyle(m_style);
if ( hatchStyle == -1 )
+#endif // !__WXMICROWIN__ && !__WXWINCE__
{
switch ( m_style )
{
- case wxTRANSPARENT:
+ case wxBRUSHSTYLE_TRANSPARENT:
m_hBrush = (HBRUSH)::GetStockObject(NULL_BRUSH);
break;
- case wxSTIPPLE:
+ case wxBRUSHSTYLE_STIPPLE:
m_hBrush = ::CreatePatternBrush(GetHbitmapOf(m_stipple));
break;
- case wxSTIPPLE_MASK_OPAQUE:
+ case wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE:
m_hBrush = ::CreatePatternBrush((HBITMAP)m_stipple.GetMask()
->GetMaskBitmap());
break;
default:
- wxFAIL_MSG( _T("unknown brush style") );
+ wxFAIL_MSG( wxT("unknown brush style") );
// fall through
- case wxSOLID:
+ case wxBRUSHSTYLE_SOLID:
m_hBrush = ::CreateSolidBrush(m_colour.GetPixel());
break;
}
}
+#ifndef __WXWINCE__
else // create a hatched brush
{
m_hBrush = ::CreateHatchBrush(hatchStyle, m_colour.GetPixel());
}
+#endif
if ( !m_hBrush )
{
- wxLogLastError(_T("CreateXXXBrush()"));
+ wxLogLastError(wxT("CreateXXXBrush()"));
}
}
{
}
-wxBrush::wxBrush(const wxColour& col, int style)
+wxBrush::wxBrush(const wxColour& col, wxBrushStyle style)
{
m_refData = new wxBrushRefData(col, style);
}
+#if FUTURE_WXWIN_COMPATIBILITY_3_0
+wxBrush::wxBrush(const wxColour& col, int style)
+{
+ m_refData = new wxBrushRefData(col, (wxBrushStyle)style);
+}
+#endif
+
wxBrush::wxBrush(const wxBitmap& stipple)
{
m_refData = new wxBrushRefData(stipple);
// 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;
return m_refData ? (brushData && *M_BRUSHDATA == *brushData) : !brushData;
}
-wxObjectRefData *wxBrush::CreateRefData() const
+wxGDIRefData *wxBrush::CreateGDIRefData() const
{
return new wxBrushRefData;
}
-wxObjectRefData *wxBrush::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
{
return new wxBrushRefData(*(const wxBrushRefData *)data);
}
wxColour wxBrush::GetColour() const
{
- wxCHECK_MSG( Ok(), wxNullColour, _T("invalid brush") );
+ wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
return M_BRUSHDATA->GetColour();
}
-int wxBrush::GetStyle() const
+wxBrushStyle wxBrush::GetStyle() const
{
- wxCHECK_MSG( Ok(), 0, _T("invalid brush") );
+ wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
return M_BRUSHDATA->GetStyle();
}
wxBitmap *wxBrush::GetStipple() const
{
- wxCHECK_MSG( Ok(), NULL, _T("invalid brush") );
+ wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
return M_BRUSHDATA->GetStipple();
}
-WXHBRUSH wxBrush::GetResourceHandle() const
+WXHANDLE wxBrush::GetResourceHandle() const
{
- wxCHECK_MSG( Ok(), FALSE, _T("invalid brush") );
+ wxCHECK_MSG( IsOk(), FALSE, wxT("invalid brush") );
- return (WXHBRUSH)M_BRUSHDATA->GetHBRUSH();
+ return (WXHANDLE)M_BRUSHDATA->GetHBRUSH();
}
// ----------------------------------------------------------------------------
M_BRUSHDATA->SetColour(wxColour(r, g, b));
}
-void wxBrush::SetStyle(int style)
+void wxBrush::SetStyle(wxBrushStyle style)
{
AllocExclusive();
M_BRUSHDATA->SetStipple(stipple);
}
-
-
projects / wxWidgets.git / blobdiff