bd30752410
Deprecate the use of the old untyped constants but don't schedule them from removal in a future wx version by removing "#if WXWIN_COMPATIBILITY_3_0" tests around their definition and use. Provoking deprecation warnings in the code using these constants is worth it as they are unclear and it's easy to make mistakes when using them, but breaking this code compilation outright can't be justified -- even in the future. Also use more informational wxDEPRECATED_MSG() instead of a simple wxDEPRECATED() as it might not be obvious at all how should the code be updated exactly. Finally, avoid the use of deprecated constants inside the library itself. As a side effect, this closes #15814. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
161 lines
3.7 KiB
C++
161 lines
3.7 KiB
C++
/////////////////////////////////////////////////////////////////////////////
|
|
// Name: src/gtk1/brush.cpp
|
|
// Purpose:
|
|
// Author: Robert Roebling
|
|
// Copyright: (c) 1998 Robert Roebling
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#include "wx/brush.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#include "wx/colour.h"
|
|
#endif
|
|
|
|
#include <gdk/gdk.h>
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// wxBrush
|
|
//-----------------------------------------------------------------------------
|
|
|
|
class wxBrushRefData: public wxGDIRefData
|
|
{
|
|
public:
|
|
wxBrushRefData()
|
|
{
|
|
m_style = wxBRUSHSTYLE_INVALID;
|
|
}
|
|
|
|
wxBrushRefData( const wxBrushRefData& data )
|
|
: wxGDIRefData()
|
|
{
|
|
m_style = data.m_style;
|
|
m_stipple = data.m_stipple;
|
|
m_colour = data.m_colour;
|
|
}
|
|
|
|
bool operator == (const wxBrushRefData& data) const
|
|
{
|
|
return (m_style == data.m_style &&
|
|
m_stipple.IsSameAs(data.m_stipple) &&
|
|
m_colour == data.m_colour);
|
|
}
|
|
|
|
wxBrushStyle m_style;
|
|
wxColour m_colour;
|
|
wxBitmap m_stipple;
|
|
};
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
|
|
|
|
IMPLEMENT_DYNAMIC_CLASS(wxBrush,wxGDIObject)
|
|
|
|
wxBrush::wxBrush( const wxColour &colour, wxBrushStyle style )
|
|
{
|
|
m_refData = new wxBrushRefData();
|
|
M_BRUSHDATA->m_style = style;
|
|
M_BRUSHDATA->m_colour = colour;
|
|
}
|
|
|
|
wxBrush::wxBrush(const wxColour& col, int style)
|
|
{
|
|
m_refData = new wxBrushRefData;
|
|
M_BRUSHDATA->m_style = (wxBrushStyle)style;
|
|
M_BRUSHDATA->m_colour = col;
|
|
}
|
|
|
|
wxBrush::wxBrush( const wxBitmap &stippleBitmap )
|
|
{
|
|
m_refData = new wxBrushRefData();
|
|
M_BRUSHDATA->m_colour = *wxBLACK;
|
|
|
|
M_BRUSHDATA->m_stipple = stippleBitmap;
|
|
|
|
if (M_BRUSHDATA->m_stipple.GetMask())
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
|
|
else
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
|
|
}
|
|
|
|
wxBrush::~wxBrush()
|
|
{
|
|
// m_refData unrefed in ~wxObject
|
|
}
|
|
|
|
wxGDIRefData *wxBrush::CreateGDIRefData() const
|
|
{
|
|
return new wxBrushRefData;
|
|
}
|
|
|
|
wxGDIRefData *wxBrush::CloneGDIRefData(const wxGDIRefData *data) const
|
|
{
|
|
return new wxBrushRefData(*(wxBrushRefData *)data);
|
|
}
|
|
|
|
bool wxBrush::operator == ( const wxBrush& brush ) const
|
|
{
|
|
if (m_refData == brush.m_refData) return true;
|
|
|
|
if (!m_refData || !brush.m_refData) return false;
|
|
|
|
return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData );
|
|
}
|
|
|
|
wxBrushStyle wxBrush::GetStyle() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), wxBRUSHSTYLE_INVALID, wxT("invalid brush") );
|
|
|
|
return M_BRUSHDATA->m_style;
|
|
}
|
|
|
|
wxColour wxBrush::GetColour() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), wxNullColour, wxT("invalid brush") );
|
|
|
|
return M_BRUSHDATA->m_colour;
|
|
}
|
|
|
|
wxBitmap *wxBrush::GetStipple() const
|
|
{
|
|
wxCHECK_MSG( IsOk(), NULL, wxT("invalid brush") );
|
|
|
|
return &M_BRUSHDATA->m_stipple;
|
|
}
|
|
|
|
void wxBrush::SetColour( const wxColour& col )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_colour = col;
|
|
}
|
|
|
|
void wxBrush::SetColour( unsigned char r, unsigned char g, unsigned char b )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_colour.Set( r, g, b );
|
|
}
|
|
|
|
void wxBrush::SetStyle( wxBrushStyle style )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_style = style;
|
|
}
|
|
|
|
void wxBrush::SetStipple( const wxBitmap& stipple )
|
|
{
|
|
AllocExclusive();
|
|
|
|
M_BRUSHDATA->m_stipple = stipple;
|
|
if (M_BRUSHDATA->m_stipple.GetMask())
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
|
|
else
|
|
M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
|
|
}
|