1945421 applied

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 2efed738bedea3b8cad42ec423437943553e953b..2edd26ca9af324e1e160a4d3e024bc9e17b0d40b 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,9 +49,6 @@
 
 #include "wx/paper.h"
 
-#if defined(__WXMAC__)
-    #include "wx/mac/private/print.h"
-#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
@@ -89,14 +86,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 +101,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 +121,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;