X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de8d512b7c844d67b2dab36addc89868e68c9b6..ee5aa9d44fa75e88bce9981d7d02dea9f6d5f3c4:/src/os2/brush.cpp?ds=sidebyside diff --git a/src/os2/brush.cpp b/src/os2/brush.cpp index acd9b7f57b..91b77c959e 100644 --- a/src/os2/brush.cpp +++ b/src/os2/brush.cpp @@ -13,12 +13,12 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP -#include -#include "wx/list.h" -#include "wx/utils.h" -#include "wx/app.h" -#include "wx/brush.h" -#include "wx/log.h" + #include + #include "wx/list.h" + #include "wx/utils.h" + #include "wx/app.h" + #include "wx/brush.h" + #include "wx/log.h" #endif #include "wx/os2/private.h" @@ -34,9 +34,7 @@ wxBrushRefData::wxBrushRefData() memset(&m_vBundle, '\0', sizeof(AREABUNDLE)); } // end of wxBrushRefData::wxBrushRefData -wxBrushRefData::wxBrushRefData( - const wxBrushRefData& rData -) +wxBrushRefData::wxBrushRefData(const wxBrushRefData& rData) { m_nStyle = rData.m_nStyle; m_vStipple = rData.m_vStipple; @@ -75,9 +73,7 @@ wxBrush::wxBrush( RealizeResource(); } // end of wxBrush::wxBrush -wxBrush::wxBrush( - const wxBitmap& rStipple -) +wxBrush::wxBrush(const wxBitmap& rStipple) { m_refData = new wxBrushRefData; @@ -201,8 +197,8 @@ bool wxBrush::RealizeResource() bOk = (bool)::GpiSetAttrs( M_BRUSHDATA->m_hBrush ,PRIM_AREA ,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | - ABB_SET | ABB_SYMBOL - ,ABB_REF_POINT + ABB_SET | ABB_SYMBOL | ABB_REF_POINT + ,ABB_SET | ABB_SYMBOL | ABB_REF_POINT ,&M_BRUSHDATA->m_vBundle ); if (!bOk) @@ -216,7 +212,7 @@ bool wxBrush::RealizeResource() return false; } // end of wxBrush::RealizeResource -WXHANDLE wxBrush::GetResourceHandle() +WXHANDLE wxBrush::GetResourceHandle() const { if (!M_BRUSHDATA) return 0; @@ -295,3 +291,16 @@ void wxBrush::SetPS( M_BRUSHDATA->m_hBrush = hPS; RealizeResource(); } // end of WxWinGdi_CPen::SetPS + + +bool wxBrush::operator == ( + const wxBrush& brush +) const +{ + if (m_refData == brush.m_refData) return true; + + if (!m_refData || !brush.m_refData) return false; + + return ( *(wxBrushRefData*)m_refData == *(wxBrushRefData*)brush.m_refData ); +} // end of wxBrush::operator == +