Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 671c3b010f5e5ffaf89dcc2e919d1b9af48c97e5..467d3f45a0b81e83ea3fc2144afba73566ab48dc 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -189,7 +188,7 @@ void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char bl
 
 unsigned char wxColour::Red() const
 {
 
 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 ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.red ;


@@ -200,7 +199,7 @@ unsigned char wxColour::Red() const
 
 unsigned char wxColour::Green() 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 ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.green ;


@@ -211,7 +210,7 @@ unsigned char wxColour::Green() const
 
 unsigned char wxColour::Blue() 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 ;
 
 #if wxUSE_NANOX
     return (unsigned char) M_COLDATA->m_color.blue ;


@@ -222,7 +221,7 @@ unsigned char wxColour::Blue() const
 
 void wxColour::CalcPixel( WXColormap cmap )
 {
 
 void wxColour::CalcPixel( WXColormap cmap )
 {

-    wxCHECK_RET( Ok(), wxT("invalid colour") );
+    wxCHECK_RET( IsOk(), wxT("invalid colour") );

 
     wxCHECK_RET( cmap, wxT("invalid colormap") );
 
 
     wxCHECK_RET( cmap, wxT("invalid colormap") );
 


@@ -231,14 +230,14 @@ void wxColour::CalcPixel( WXColormap cmap )
 
 unsigned long wxColour::GetPixel() const
 {
 
 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
 {
 
     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;
 }
 
     return (WXColor*) &M_COLDATA->m_color;
 }