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

Miscellaneous, mostly cosmetic changes. wxPen/wxFont/wxBrush altered so Set...

Browse Source 
functions don't change shared objects.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-09 16:46:37 +00:00
parent 5e25ba908f
commit b823f5a145
17 changed files with 205 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
src/msw/pen.cpp
View File

@@ -38,7 +38,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
wxPenRefData::wxPenRefData(void)
{
// m_stipple = NULL ;
m_style = wxSOLID;
m_width = 1;
m_join = wxJOIN_ROUND ;
@@ -48,6 +47,18 @@ wxPenRefData::wxPenRefData(void)
m_hPen = 0;
}
wxPenRefData::wxPenRefData(const wxPenRefData& data)
{
m_style = data.m_style;
m_width = data.m_width;
m_join = data.m_join;
m_cap = data.m_cap;
m_nbDash = data.m_nbDash;
m_dash = data.m_dash;
m_colour = data.m_colour;
m_hPen = 0;
}
wxPenRefData::~wxPenRefData(void)
{
if ( m_hPen )
@@ -288,123 +299,106 @@ bool wxPen::FreeResource(bool force)
else return FALSE;
}
/*
bool wxPen::UseResource(void)
{
IncrementResourceUsage();
return TRUE;
}
bool wxPen::ReleaseResource(void)
{
DecrementResourceUsage();
return TRUE;
}
*/
bool wxPen::IsFree(void)
{
return (M_PENDATA && M_PENDATA->m_hPen == 0);
}
void wxPen::Unshare()
{
// Don't change shared data
if (!m_refData)
{
m_refData = new wxPenRefData();
}
else
{
wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData);
UnRef();
m_refData = ref;
}
}
void wxPen::SetColour(const wxColour& col)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_colour = col;
M_PENDATA->m_colour = col;
if (FreeResource())
RealizeResource();
}
void wxPen::SetColour(const wxString& col)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_colour = col;
M_PENDATA->m_colour = col;
if (FreeResource())
RealizeResource();
}
void wxPen::SetColour(const unsigned char r, const unsigned char g, const unsigned char b)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_colour.Set(r, g, b);
M_PENDATA->m_colour.Set(r, g, b);
if (FreeResource())
RealizeResource();
}
void wxPen::SetWidth(int Width)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_width = Width;
M_PENDATA->m_width = Width;
if (FreeResource())
RealizeResource();
}
void wxPen::SetStyle(int Style)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_style = Style;
M_PENDATA->m_style = Style;
if (FreeResource())
RealizeResource();
}
void wxPen::SetStipple(const wxBitmap& Stipple)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_stipple = Stipple;
M_PENDATA->m_style = wxSTIPPLE;
M_PENDATA->m_stipple = Stipple;
M_PENDATA->m_style = wxSTIPPLE;
if (FreeResource())
RealizeResource();
}
void wxPen::SetDashes(int nb_dashes, const wxDash *Dash)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash;
M_PENDATA->m_nbDash = nb_dashes;
M_PENDATA->m_dash = (wxDash *)Dash;
if (FreeResource())
RealizeResource();
}
void wxPen::SetJoin(int Join)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_join = Join;
M_PENDATA->m_join = Join;
if (FreeResource())
RealizeResource();
}
void wxPen::SetCap(int Cap)
{
if ( !M_PENDATA )
m_refData = new wxPenRefData;
Unshare();
M_PENDATA->m_cap = Cap;
M_PENDATA->m_cap = Cap;
if (FreeResource())
RealizeResource();
}