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

Added missing test in wxObject::Ref() for already

Browse Source 
equal objects (same m_refData).
  Implemented new ref counting for wxBrush, wxPen
    and wxColour (in addition to wxRegion). Also
    inlined some more functions and implemented
    real comparisons.
  Corrected refresh code to update GTK's window-less
    widgets if overdrawn after a wxWindow::Refresh().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2002-02-04 18:01:21 +00:00
parent a407ff6ae8
commit c89f5c02b1
20 changed files with 524 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
src/gtk/pen.cpp
View File

@@ -23,43 +23,48 @@
class wxPenRefData: public wxObjectRefData
{
public:
wxPenRefData();
wxPenRefData( const wxPenRefData& data );
int m_width;
int m_style;
int m_joinStyle;
int m_capStyle;
wxColour m_colour;
int m_countDashes;
wxGTKDash *m_dash;
};
wxPenRefData::wxPenRefData()
{
m_width = 1;
m_style = wxSOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
m_dash = (wxGTKDash*) NULL;
m_countDashes = 0;
}
wxPenRefData::wxPenRefData( const wxPenRefData& data )
{
m_style = data.m_style;
m_width = data.m_width;
m_joinStyle = data.m_joinStyle;
m_capStyle = data.m_capStyle;
m_colour = data.m_colour;
m_countDashes = data.m_countDashes;
wxPenRefData()
{
m_width = 1;
m_style = wxSOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
m_dash = (wxGTKDash*) NULL;
m_countDashes = 0;
}
wxPenRefData( const wxPenRefData& data )
{
m_style = data.m_style;
m_width = data.m_width;
m_joinStyle = data.m_joinStyle;
m_capStyle = data.m_capStyle;
m_colour = data.m_colour;
m_countDashes = data.m_countDashes;
/*
if (data.m_dash) TODO
m_dash = new
if (data.m_dash) TODO
m_dash = new
*/
m_dash = data.m_dash;
}
m_dash = data.m_dash;
}
bool operator == (const wxPenRefData& data) const
{
return (m_style == data.m_style &&
m_width == data.m_width &&
m_joinStyle == data.m_joinStyle &&
m_capStyle == data.m_capStyle &&
m_colour == data.m_colour);
}
int m_width;
int m_style;
int m_joinStyle;
int m_capStyle;
wxColour m_colour;
int m_countDashes;
wxGTKDash *m_dash;
};
//-----------------------------------------------------------------------------
@@ -67,10 +72,6 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
wxPen::wxPen()
{
}
wxPen::wxPen( const wxColour &colour, int width, int style )
{
m_refData = new wxPenRefData();
@@ -79,73 +80,77 @@ wxPen::wxPen( const wxColour &colour, int width, int style )
M_PENDATA->m_colour = colour;
}
wxPen::wxPen( const wxPen& pen )
{
Ref( pen );
}
wxPen::~wxPen()
{
// m_refData unrefed in ~wxObject
}
wxPen& wxPen::operator = ( const wxPen& pen )
wxObjectRefData *wxPen::CreateRefData() const
{
if ( m_refData != pen.m_refData )
Ref( pen );
return new wxPenRefData;
}
return *this;
wxObjectRefData *wxPen::CloneRefData(const wxObjectRefData *data) const
{
return new wxPenRefData(*(wxPenRefData *)data);
}
bool wxPen::operator == ( const wxPen& pen ) const
{
return m_refData == pen.m_refData;
}
bool wxPen::operator != ( const wxPen& pen ) const
{
return m_refData != pen.m_refData;
if (m_refData == pen.m_refData) return TRUE;
if (!m_refData || !pen.m_refData) return FALSE;
return ( *(wxPenRefData*)m_refData == *(wxPenRefData*)pen.m_refData );
}
void wxPen::SetColour( const wxColour &colour )
{
Unshare();
AllocExclusive();
M_PENDATA->m_colour = colour;
}
void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
{
Unshare();
AllocExclusive();
M_PENDATA->m_countDashes = number_of_dashes;
M_PENDATA->m_dash = (wxGTKDash *)dash; /* TODO */
}
void wxPen::SetColour( int red, int green, int blue )
{
Unshare();
AllocExclusive();
M_PENDATA->m_colour.Set( red, green, blue );
}
void wxPen::SetCap( int capStyle )
{
Unshare();
AllocExclusive();
M_PENDATA->m_capStyle = capStyle;
}
void wxPen::SetJoin( int joinStyle )
{
Unshare();
AllocExclusive();
M_PENDATA->m_joinStyle = joinStyle;
}
void wxPen::SetStyle( int style )
{
Unshare();
AllocExclusive();
M_PENDATA->m_style = style;
}
void wxPen::SetWidth( int width )
{
Unshare();
AllocExclusive();
M_PENDATA->m_width = width;
}
@@ -200,22 +205,3 @@ wxColour &wxPen::GetColour() const
return M_PENDATA->m_colour;
}
bool wxPen::Ok() const
{
return (m_refData != NULL);
}
void wxPen::Unshare()
{
if (!m_refData)
{
m_refData = new wxPenRefData();
}
else
{
wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
UnRef();
m_refData = ref;
}
}