Don't use "Cancel" button in the about dialog of the listctrl sample.

[wxWidgets.git] / src / x11 / colour.cpp

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 671c3b010f5e5ffaf89dcc2e919d1b9af48c97e5..bd3b94f578622e394dac126cf26f4fb347a0395a 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -189,7 +189,7 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl
 
 unsigned char wxColour::Red() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.red ;
@@ -200,7 +200,7 @@ unsigned char wxColour::Red() const
 
 unsigned char wxColour::Green() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.green ;
@@ -211,7 +211,7 @@ unsigned char wxColour::Green() const
 
 unsigned char wxColour::Blue() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.blue ;
@@ -222,7 +222,7 @@ unsigned char wxColour::Blue() const
 
 void wxColour::CalcPixel( WXColormap cmap )
 {
-    wxCHECK_RET( Ok(), wxT("invalid colour") );
+    wxCHECK_RET( IsOk(), wxT("invalid colour") );
 
     wxCHECK_RET( cmap, wxT("invalid colormap") );
 
@@ -231,14 +231,14 @@ void wxColour::CalcPixel( WXColormap cmap )
 
 unsigned long wxColour::GetPixel() const
 {
-    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
 
     return M_COLDATA->m_color.pixel;
 }
 
 WXColor *wxColour::GetColor() const
 {
-    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );
 
     return (WXColor*) &M_COLDATA->m_color;
 }