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

blind compilation fixes for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-10-31 12:02:36 +00:00
parent 0df2f30c18
commit 7aa920b5a5
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/os2/brush.h
View File

@@ -26,6 +26,13 @@ public:
wxBrushRefData(const wxBrushRefData& rData); wxBrushRefData(const wxBrushRefData& rData);
virtual ~wxBrushRefData(); virtual ~wxBrushRefData();
bool operator == (const wxBrushRefData& data) const
{
return (m_nStyle == data.m_nStyle &&
m_vStipple.IsSameAs(data.m_vStipple) &&
m_vColour == data.m_vColour);
}
protected: protected:
int m_nStyle; int m_nStyle;
wxBitmap m_vStipple ; wxBitmap m_vStipple ;

6
include/wx/os2/pen.h
View File

@@ -35,8 +35,8 @@ public:
m_nJoin == data.m_nJoin && m_nJoin == data.m_nJoin &&
m_nCap == data.m_nCap && m_nCap == data.m_nCap &&
m_vColour == data.m_vColour && m_vColour == data.m_vColour &&
(m_style != wxSTIPPLE || m_stipple.IsSameAs(data.m_stipple)) && (m_nStyle != wxSTIPPLE || m_vStipple.IsSameAs(data.m_vStipple)) &&
(m_style != wxUSER_DASH || (m_nStyle != wxUSER_DASH ||
(m_dash == data.m_dash && (m_dash == data.m_dash &&
memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0)); memcmp(m_dash, data.m_dash, m_nbDash*sizeof(wxDash)) == 0));
} }
@@ -72,7 +72,7 @@ public:
inline bool operator == (const wxPen& rPen) const inline bool operator == (const wxPen& rPen) const
{ {
const wxPenRefData *penData = (wxPenRefData *)pen.m_refData; const wxPenRefData *penData = (wxPenRefData *)rPen.m_refData;
// an invalid pen is only equal to another invalid pen // an invalid pen is only equal to another invalid pen
return m_refData ? penData && *M_PENDATA == *penData : !penData; return m_refData ? penData && *M_PENDATA == *penData : !penData;

13
src/os2/brush.cpp
View File

@@ -291,3 +291,16 @@ void wxBrush::SetPS(
M_BRUSHDATA->m_hBrush = hPS; M_BRUSHDATA->m_hBrush = hPS;
RealizeResource(); RealizeResource();
} // end of WxWinGdi_CPen::SetPS } // 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 ==