X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e6b83091a1ef0114a3b45af43ee66832f1876bb..93c96bab3d24aaac4e240e83463b1f7874f9d4b8:/src/gtk1/colour.cpp

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index bf2fa2a342..a39f2af429 100644
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -15,8 +15,8 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/gdicmn.h"
 #include "wx/colour.h"
+#include "wx/gdicmn.h"
 #include "wx/gtk/private.h"
 
 #include <gdk/gdk.h>
@@ -37,7 +37,7 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;
-        m_hasPixel = FALSE;
+        m_hasPixel = false;
     }
 
     wxColourRefData(const wxColourRefData& data)
@@ -110,7 +110,7 @@ void wxColourRefData::FreeColour()
             colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
 
             if (colMapAllocCounter[ idx ] == 0)
-            gdk_colormap_free_colors( m_colormap, &m_color, 1 );
+                gdk_colormap_free_colors( m_colormap, &m_color, 1 );
         }
     }
 }
@@ -124,7 +124,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 #ifdef __WXGTK20__
     if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-	     (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
+         (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) )
 #else
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
@@ -146,7 +146,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
+// GDK's values are in 0..65535 range, our are in 0..255
+#define SHIFT  8
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
@@ -207,10 +208,10 @@ wxColour::~wxColour()
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData)
-        return TRUE;
+        return true;
 
     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);
@@ -239,7 +240,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_hasPixel = FALSE;
+    M_COLDATA->m_hasPixel = false;
 }
 
 unsigned char wxColour::Red() const
@@ -283,5 +284,3 @@ GdkColor *wxColour::GetColor() const
 
     return &M_COLDATA->m_color;
 }
-
-