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

Added serial code for wxList and wxHashTable to source tree

Browse Source 
Added a few accessors to wxList (for above)
  Fixed bug with GetClientSize() and sunken frames without
  scrollbars
  Made pixel corrections to wxListCtrl and wxFrame
  Added a few pixels before first tool in toolbar
  Added a few wxCHECKs here and there


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-07 08:27:06 +00:00
parent ef5390661e
commit 907789a0f7
18 changed files with 801 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/gtk1/pen.cpp
View File

@@ -20,33 +20,33 @@
class wxPenRefData: public wxObjectRefData
{
public:
public:
wxPenRefData(void);
wxPenRefData(const wxPenRefData& data);
wxPenRefData(void);
wxPenRefData(const wxPenRefData& data);
int m_width;
int m_style;
int m_joinStyle;
int m_capStyle;
wxColour m_colour;
int m_width;
int m_style;
int m_joinStyle;
int m_capStyle;
wxColour m_colour;
};
wxPenRefData::wxPenRefData(void)
wxPenRefData::wxPenRefData()
{
m_width = 1;
m_style = wxSOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
m_width = 1;
m_style = wxSOLID;
m_joinStyle = wxJOIN_ROUND;
m_capStyle = wxCAP_ROUND;
}
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_style = data.m_style;
m_width = data.m_width;
m_joinStyle = data.m_joinStyle;
m_capStyle = data.m_capStyle;
m_colour = data.m_colour;
}
//-----------------------------------------------------------------------------
@@ -57,162 +57,142 @@ IMPLEMENT_DYNAMIC_CLASS(wxPen,wxGDIObject)
wxPen::wxPen(void)
{
if (wxThePenList) wxThePenList->AddPen( this );
if (wxThePenList) wxThePenList->AddPen( this );
}
wxPen::wxPen( const wxColour &colour, int width, int style )
{
m_refData = new wxPenRefData();
M_PENDATA->m_width = width;
M_PENDATA->m_style = style;
M_PENDATA->m_colour = colour;
m_refData = new wxPenRefData();
M_PENDATA->m_width = width;
M_PENDATA->m_style = style;
M_PENDATA->m_colour = colour;
if (wxThePenList) wxThePenList->AddPen( this );
if (wxThePenList) wxThePenList->AddPen( this );
}
wxPen::wxPen( const wxPen& pen )
{
Ref( pen );
if (wxThePenList) wxThePenList->AddPen( this );
Ref( pen );
if (wxThePenList) wxThePenList->AddPen( this );
}
wxPen::wxPen( const wxPen* pen )
{
UnRef();
if (pen) Ref( *pen );
UnRef();
if (pen) Ref( *pen );
if (wxThePenList) wxThePenList->AddPen( this );
if (wxThePenList) wxThePenList->AddPen( this );
}
wxPen::~wxPen(void)
wxPen::~wxPen()
{
if (wxThePenList) wxThePenList->RemovePen( this );
if (wxThePenList) wxThePenList->RemovePen( this );
}
wxPen& wxPen::operator = ( const wxPen& pen )
{
if (*this == pen) return (*this);
Ref( pen );
return *this;
if (*this == pen) return (*this);
Ref( pen );
return *this;
}
bool wxPen::operator == ( const wxPen& pen )
{
return m_refData == pen.m_refData;
return m_refData == pen.m_refData;
}
bool wxPen::operator != ( const wxPen& pen )
{
return m_refData != pen.m_refData;
return m_refData != pen.m_refData;
}
void wxPen::SetColour( const wxColour &colour )
{
Unshare();
M_PENDATA->m_colour = colour;
Unshare();
M_PENDATA->m_colour = colour;
}
void wxPen::SetColour( int red, int green, int blue )
{
Unshare();
M_PENDATA->m_colour.Set( red, green, blue );
Unshare();
M_PENDATA->m_colour.Set( red, green, blue );
}
void wxPen::SetCap( int capStyle )
{
Unshare();
M_PENDATA->m_capStyle = capStyle;
Unshare();
M_PENDATA->m_capStyle = capStyle;
}
void wxPen::SetJoin( int joinStyle )
{
Unshare();
M_PENDATA->m_joinStyle = joinStyle;
Unshare();
M_PENDATA->m_joinStyle = joinStyle;
}
void wxPen::SetStyle( int style )
{
Unshare();
M_PENDATA->m_style = style;
Unshare();
M_PENDATA->m_style = style;
}
void wxPen::SetWidth( int width )
{
Unshare();
M_PENDATA->m_width = width;
Unshare();
M_PENDATA->m_width = width;
}
int wxPen::GetCap(void) const
int wxPen::GetCap() const
{
if (!m_refData)
{
wxFAIL_MSG( "invalid pen" );
return -1;
}
wxCHECK_MSG( Ok(), -1, "invalid pen" );
return M_PENDATA->m_capStyle;
return M_PENDATA->m_capStyle;
}
int wxPen::GetJoin(void) const
int wxPen::GetJoin() const
{
if (!m_refData)
{
wxFAIL_MSG( "invalid pen" );
return -1;
}
wxCHECK_MSG( Ok(), -1, "invalid pen" );
return M_PENDATA->m_joinStyle;
return M_PENDATA->m_joinStyle;
}
int wxPen::GetStyle(void) const
int wxPen::GetStyle() const
{
if (!m_refData)
{
wxFAIL_MSG( "invalid pen" );
return -1;
}
wxCHECK_MSG( Ok(), -1, "invalid pen" );
return M_PENDATA->m_style;
return M_PENDATA->m_style;
}
int wxPen::GetWidth(void) const
int wxPen::GetWidth() const
{
if (!m_refData)
{
wxFAIL_MSG( "invalid pen" );
return -1;
}
wxCHECK_MSG( Ok(), -1, "invalid pen" );
return M_PENDATA->m_width;
return M_PENDATA->m_width;
}
wxColour &wxPen::GetColour(void) const
wxColour &wxPen::GetColour() const
{
if (!m_refData)
{
wxFAIL_MSG( "invalid pen" );
return wxNullColour;
}
wxCHECK_MSG( Ok(), wxNullColour, "invalid pen" );
return M_PENDATA->m_colour;
return M_PENDATA->m_colour;
}
bool wxPen::Ok(void) const
bool wxPen::Ok() const
{
return (m_refData != NULL);
return (m_refData != NULL);
}
void wxPen::Unshare(void)
void wxPen::Unshare()
{
if (!m_refData)
{
m_refData = new wxPenRefData();
}
else
{
wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
UnRef();
m_refData = ref;
}
if (!m_refData)
{
m_refData = new wxPenRefData();
}
else
{
wxPenRefData* ref = new wxPenRefData( *(wxPenRefData*)m_refData );
UnRef();
m_refData = ref;
}
}