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

fixes for user dash handling (patch 717736)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-04-11 14:02:32 +00:00
parent 3251b83466
commit e2a5251d01
6 changed files with 54 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/msw/pen.h
View File

@@ -53,6 +53,7 @@ private:
};
#define M_PENDATA ((wxPenRefData *)m_refData)
#define wxPENDATA(x) ((wxPenRefData *)(x).m_refData)
// Pen
class WXDLLEXPORT wxPen: public wxGDIObject
@@ -66,8 +67,28 @@ public:
~wxPen();
inline wxPen& operator = (const wxPen& pen) { if (*this == pen) return (*this); Ref(pen); return *this; }
inline bool operator == (const wxPen& pen) const { return m_refData == pen.m_refData; }
inline bool operator != (const wxPen& pen) const { return m_refData != pen.m_refData; }
inline bool operator == (const wxPen& pen) const
{
// It is impossible to know if the user dashes have changed,
// so we must assume that they have
if ( m_refData && pen.m_refData )
{
if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
return false;
}
return m_refData == pen.m_refData;
}
inline bool operator != (const wxPen& pen) const
{
// It is impossible to know if the user dashes have changed,
// so we must assume that they have
if ( m_refData && pen.m_refData )
{
if ( M_PENDATA->m_nbDash != 0 || wxPENDATA(pen)->m_nbDash != 0 )
return true;
}
return m_refData != pen.m_refData;
}
virtual bool Ok() const { return (m_refData != NULL) ; }