Fix the off-by-one a little differently, and correct a refresh problem

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index bf2fa2a34297e58e6c07ad86ea91a0bd7616bac7..98946e16496b8df648ad934c9b019bbc5e94c615 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -37,7 +37,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;

-        m_hasPixel = FALSE;
+        m_hasPixel = false;

     }
 
     wxColourRefData(const wxColourRefData& data)
     }
 
     wxColourRefData(const wxColourRefData& data)


@@ -207,10 +207,10 @@ wxColour::~wxColour()
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData)
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData)

-        return TRUE;
+        return true;

 
     if (!m_refData || !col.m_refData)
 
     if (!m_refData || !col.m_refData)

-        return FALSE;
+        return false;

 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);


@@ -239,7 +239,7 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 
     M_COLDATA->m_colormap = (GdkColormap*) NULL;
     M_COLDATA->m_color.pixel = 0;
 
     M_COLDATA->m_colormap = (GdkColormap*) NULL;

-    M_COLDATA->m_hasPixel = FALSE;
+    M_COLDATA->m_hasPixel = false;

 }
 
 unsigned char wxColour::Red() const
 }
 
 unsigned char wxColour::Red() const