From 559843f078f8f64d1dfa6c671c65756319a21636 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 18 Nov 2007 20:42:46 +0000 Subject: [PATCH] fix gcc signed/unsigned comparison warnings after recent changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/cmndata.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index 2efed738be..ba6c494e40 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -89,14 +89,14 @@ wxColourData::~wxColourData() void wxColourData::SetCustomColour(int i, const wxColour& colour) { - wxCHECK_RET( (i >= 0 && i < WXSIZEOF(m_custColours)), _T("custom colour index out of range") ); + wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, _T("custom colour index out of range") ); m_custColours[i] = colour; } wxColour wxColourData::GetCustomColour(int i) { - wxCHECK_MSG( (i >= 0 && i < WXSIZEOF(m_custColours)), wxColour(0,0,0), + wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0), _T("custom colour index out of range") ); return m_custColours[i]; @@ -104,7 +104,7 @@ wxColour wxColourData::GetCustomColour(int i) wxColourData& wxColourData::operator=(const wxColourData& data) { - for (int i = 0; i < WXSIZEOF(m_custColours); i++) + for ( int i = 0; i < NUM_CUSTOM; i++) m_custColours[i] = data.m_custColours[i]; m_dataColour = data.m_dataColour; @@ -124,7 +124,7 @@ wxString wxColourData::ToString() const { wxString str(m_chooseFull ? '1' : '0'); - for ( int i = 0; i < WXSIZEOF(m_custColours); i++ ) + for ( int i = 0; i < NUM_CUSTOM; i++ ) { str += wxCOL_DATA_SEP; -- 2.47.2