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

compilation fixes after pen/brush styles changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-03-21 23:39:11 +00:00
parent b23bb1f962
commit 2051c39fae
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/x11/pen.h
View File

@@ -52,7 +52,7 @@ public:
void SetStyle( wxPenStyle style ); void SetStyle( wxPenStyle style );
void SetWidth( int width ); void SetWidth( int width );
void SetDashes( int number_of_dashes, const wxDash *dash ); void SetDashes( int number_of_dashes, const wxDash *dash );
void SetStipple( wxBitmap *stipple ); void SetStipple( const wxBitmap& stipple );
wxColour &GetColour() const; wxColour &GetColour() const;
wxPenCap GetCap() const; wxPenCap GetCap() const;

16
src/x11/brush.cpp
View File

@@ -29,7 +29,7 @@ class wxBrushRefData : public wxGDIRefData
public: public:
wxBrushRefData() wxBrushRefData()
{ {
m_style = 0; m_style = wxBRUSHSTYLE_INVALID;
} }
wxBrushRefData( const wxBrushRefData& data ) wxBrushRefData( const wxBrushRefData& data )
@@ -69,7 +69,7 @@ wxBrush::wxBrush(const wxColour& col, int style)
{ {
m_refData = new wxBrushRefData; m_refData = new wxBrushRefData;
M_BRUSHDATA->m_style = (wxBrushStyle)style; M_BRUSHDATA->m_style = (wxBrushStyle)style;
M_BRUSHDATA->m_colour = colour; M_BRUSHDATA->m_colour = col;
} }
#endif #endif
@@ -81,9 +81,9 @@ wxBrush::wxBrush( const wxBitmap &stippleBitmap )
M_BRUSHDATA->m_stipple = stippleBitmap; M_BRUSHDATA->m_stipple = stippleBitmap;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE; M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
else else
M_BRUSHDATA->m_style = wxSTIPPLE; M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
} }
wxBrush::~wxBrush() wxBrush::~wxBrush()
@@ -158,11 +158,7 @@ void wxBrush::SetStipple( const wxBitmap& stipple )
M_BRUSHDATA->m_stipple = stipple; M_BRUSHDATA->m_stipple = stipple;
if (M_BRUSHDATA->m_stipple.GetMask()) if (M_BRUSHDATA->m_stipple.GetMask())
{ M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK_OPAQUE;
M_BRUSHDATA->m_style = wxSTIPPLE_MASK_OPAQUE;
}
else else
{ M_BRUSHDATA->m_style = wxBRUSHSTYLE_STIPPLE_MASK;
M_BRUSHDATA->m_style = wxSTIPPLE;
}
} }

10
src/x11/pen.cpp
View File

@@ -156,11 +156,11 @@ void wxPen::SetJoin( wxPenJoin joinStyle )
M_PENDATA->m_joinStyle = joinStyle; M_PENDATA->m_joinStyle = joinStyle;
} }
void wxPen::SetStipple( wxBitmap *stipple ) void wxPen::SetStipple( const wxBitmap& stipple )
{ {
AllocExclusive(); AllocExclusive();
M_PENDATA->m_stipple = *stipple; M_PENDATA->m_stipple = stipple;
} }
void wxPen::SetStyle( wxPenStyle style ) void wxPen::SetStyle( wxPenStyle style )
@@ -197,21 +197,21 @@ wxDash* wxPen::GetDash() const
wxPenCap wxPen::GetCap() const wxPenCap wxPen::GetCap() const
{ {
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); wxCHECK_MSG( Ok(), wxCAP_INVALID, wxT("invalid pen") );
return M_PENDATA->m_capStyle; return M_PENDATA->m_capStyle;
} }
wxPenJoin wxPen::GetJoin() const wxPenJoin wxPen::GetJoin() const
{ {
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); wxCHECK_MSG( Ok(), wxJOIN_INVALID, wxT("invalid pen") );
return M_PENDATA->m_joinStyle; return M_PENDATA->m_joinStyle;
} }
wxPenStyle wxPen::GetStyle() const wxPenStyle wxPen::GetStyle() const
{ {
wxCHECK_MSG( Ok(), -1, wxT("invalid pen") ); wxCHECK_MSG( Ok(), wxPENSTYLE_INVALID, wxT("invalid pen") );
return M_PENDATA->m_style; return M_PENDATA->m_style;
} }