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

Updated testconf

Browse Source 
Added dashed pens etc.
  Made tree ctrl sample crash..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-07-19 14:41:30 +00:00
parent 510649e4d5
commit 112c5086e8
9 changed files with 247 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/gtk1/pen.cpp
View File

@@ -24,14 +24,16 @@ class wxPenRefData: public wxObjectRefData
{
public:
wxPenRefData(void);
wxPenRefData(const wxPenRefData& data);
wxPenRefData();
wxPenRefData( const wxPenRefData& data );
int m_width;
int m_style;
int m_joinStyle;
int m_capStyle;
wxColour m_colour;
int m_countDashes;
wxDash *m_dash;
};
wxPenRefData::wxPenRefData()
@@ -40,6 +42,8 @@ wxPenRefData::wxPenRefData()
m_style = wxSOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
m_dash = (wxDash*) NULL;
m_countDashes = 0;
}
wxPenRefData::wxPenRefData( const wxPenRefData& data )
@@ -49,6 +53,12 @@ wxPenRefData::wxPenRefData( const wxPenRefData& data )
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
*/
m_dash = data.m_dash;
}
//-----------------------------------------------------------------------------
@@ -106,6 +116,13 @@ void wxPen::SetColour( const wxColour &colour )
M_PENDATA->m_colour = colour;
}
void wxPen::SetDashes( int number_of_dashes, const wxDash *dash )
{
Unshare();
M_PENDATA->m_countDashes = number_of_dashes;
M_PENDATA->m_dash = (wxDash *)dash; /* TODO */
}
void wxPen::SetColour( int red, int green, int blue )
{
Unshare();
@@ -136,6 +153,22 @@ void wxPen::SetWidth( int width )
M_PENDATA->m_width = width;
}
int wxPen::GetDashes( wxDash **ptr ) const
{
*ptr = (M_PENDATA ? M_PENDATA->m_dash : (wxDash*) NULL);
return (M_PENDATA ? M_PENDATA->m_countDashes : 0);
}
int wxPen::GetDashCount() const
{
return (M_PENDATA->m_countDashes);
}
wxDash* wxPen::GetDash() const
{
return (M_PENDATA->m_dash);
}
int wxPen::GetCap() const
{
wxCHECK_MSG( Ok(), -1, _T("invalid pen") );