Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure that the pen and bush are properly initialized

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-28 02:28:38 +00:00
parent b2983f422f
commit 7f8bd9fc5f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/generic/graphicc.cpp
View File

@@ -380,7 +380,8 @@ wxCairoPenData::wxCairoPenData( wxGraphicsRenderer* renderer, const wxPen &pen )
: wxGraphicsObjectRefData(renderer) : wxGraphicsObjectRefData(renderer)
{ {
Init(); Init();
m_width = pen.GetWidth(); m_pen = pen;
m_width = m_pen.GetWidth();
if (m_width <= 0.0) if (m_width <= 0.0)
m_width = 0.1; m_width = 0.1;
@@ -558,7 +559,8 @@ void wxCairoPenData::Apply( wxGraphicsContext* context )
// wxCairoBrushData implementation // wxCairoBrushData implementation
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer ) : wxGraphicsObjectRefData( renderer ) wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer )
: wxGraphicsObjectRefData( renderer )
{ {
Init(); Init();
} }
@@ -566,6 +568,8 @@ wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer ) : wxGraphicsO
wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush ) wxCairoBrushData::wxCairoBrushData( wxGraphicsRenderer* renderer, const wxBrush &brush )
: wxGraphicsObjectRefData(renderer) : wxGraphicsObjectRefData(renderer)
{ {
Init();
m_red = brush.GetColour().Red()/255.0; m_red = brush.GetColour().Red()/255.0;
m_green = brush.GetColour().Green()/255.0; m_green = brush.GetColour().Green()/255.0;
m_blue = brush.GetColour().Blue()/255.0; m_blue = brush.GetColour().Blue()/255.0;