applying patch, fixes #10523

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index ee95c0a045c0b012c5bc3da3b87ce107f7064494..0f5d8a4f8715d99fb13e696b7b44e62558bf2a95 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -1,24 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/motif/colour.cpp

 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxColour class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 //// TODO: make wxColour a ref-counted object,
 //// so pixel values get shared.
 
 /////////////////////////////////////////////////////////////////////////////
 
 //// TODO: make wxColour a ref-counted object,
 //// so pixel values get shared.
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colour.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#include "wx/gdicmn.h"

 #include "wx/colour.h"
 #include "wx/colour.h"

-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/gdicmn.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -32,18 +34,18 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

+wxCOMPILE_TIME_ASSERT( sizeof(WXPixel) == sizeof(Pixel), PixelSizeIsOk );
+

 // Colour
 
 // Colour
 

-wxColour::wxColour ()
+void wxColour::Init()

 {
 {

-    m_isInit = FALSE;
-    m_red =
-    m_blue =
-    m_green = 0;
+    m_isInit = false;
+    m_red = m_blue = m_green = 0;

     m_pixel = -1;
 }
 
     m_pixel = -1;
 }
 

-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(const wxColour& col)

 {
     *this = col;
 }
 {
     *this = col;
 }


@@ -58,49 +60,45 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& name)
+wxColour::~wxColour()

 {
 {

-    *this = wxTheColourDatabase->Find(name);

 }
 
 }
 

-wxColour::~wxColour ()
-{
-}
-
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
+                        unsigned char WXUNUSED(a))

 {
     m_red = r;
     m_green = g;
     m_blue = b;
 {
     m_red = r;
     m_green = g;
     m_blue = b;

-    m_isInit = TRUE;
+    m_isInit = true;

     m_pixel = -1;
 }
 
 // Allocate a colour, or nearest colour, using the given display.
     m_pixel = -1;
 }
 
 // Allocate a colour, or nearest colour, using the given display.

-// If realloc is TRUE, ignore the existing pixel, otherwise just return
+// If realloc is true, ignore the existing pixel, otherwise just return

 // the existing one.
 // Returns the old or allocated pixel.
 
 // TODO: can this handle mono displays? If not, we should have an extra
 // flag to specify whether this should be black or white by default.
 
 // the existing one.
 // Returns the old or allocated pixel.
 
 // TODO: can this handle mono displays? If not, we should have an extra
 // flag to specify whether this should be black or white by default.
 

-int wxColour::AllocColour(WXDisplay* display, bool realloc)
+WXPixel wxColour::AllocColour(WXDisplay* display, bool realloc)

 {
     if ((m_pixel != -1) && !realloc)
         return m_pixel;
 {
     if ((m_pixel != -1) && !realloc)
         return m_pixel;

-    
+

     XColor color;
     color.red = (unsigned short) Red ();
     XColor color;
     color.red = (unsigned short) Red ();

-    color.red |= color.red << 8;
+    color.red |= (unsigned short)(color.red << 8);

     color.green = (unsigned short) Green ();
     color.green = (unsigned short) Green ();

-    color.green |= color.green << 8;
+    color.green |= (unsigned short)(color.green << 8);

     color.blue = (unsigned short) Blue ();
     color.blue = (unsigned short) Blue ();

-    color.blue |= color.blue << 8;
-    
+    color.blue |= (unsigned short)(color.blue << 8);
+

     color.flags = DoRed | DoGreen | DoBlue;
     color.flags = DoRed | DoGreen | DoBlue;

-    
+

     WXColormap cmap = wxTheApp->GetMainColormap(display);
     WXColormap cmap = wxTheApp->GetMainColormap(display);

-    
+

     if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
     {
         m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);
     if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
     {
         m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);


@@ -108,7 +106,7 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
     }
     else
     {
     }
     else
     {

-        m_pixel = (int) color.pixel;
+        m_pixel = (WXPixel) color.pixel;

         return m_pixel;
     }
 }
         return m_pixel;
     }
 }


@@ -143,33 +141,33 @@ A read-only colour will not change.
   may give better matching.
 -------------------------------------------*/
 
   may give better matching.
 -------------------------------------------*/
 

-int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap)
+WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap)

 {
     if (cmap == (Colormap) NULL)
         cmap = (Colormap) wxTheApp->GetMainColormap(display);
 {
     if (cmap == (Colormap) NULL)
         cmap = (Colormap) wxTheApp->GetMainColormap(display);

-    
+

     int numPixVals = XDisplayCells(display, DefaultScreen (display));
     int mindist = 256 * 256 * 3;
     int numPixVals = XDisplayCells(display, DefaultScreen (display));
     int mindist = 256 * 256 * 3;

-    int bestpixel = (int) BlackPixel (display, DefaultScreen (display));
+    Pixel bestpixel = BlackPixel (display, DefaultScreen (display));

     int red = desiredColor->red >> 8;
     int green = desiredColor->green >> 8;
     int blue = desiredColor->blue >> 8;
     const int threshold = 2 * 2 * 3;    // allow an error of up to 2 in R,G & B
     int red = desiredColor->red >> 8;
     int green = desiredColor->green >> 8;
     int blue = desiredColor->blue >> 8;
     const int threshold = 2 * 2 * 3;    // allow an error of up to 2 in R,G & B

-    
+

     for (int pixelcount = 0; pixelcount < numPixVals; pixelcount++)
     {
         XColor matching_color;
         matching_color.pixel = pixelcount;
         XQueryColor(display,cmap,&matching_color);
     for (int pixelcount = 0; pixelcount < numPixVals; pixelcount++)
     {
         XColor matching_color;
         matching_color.pixel = pixelcount;
         XQueryColor(display,cmap,&matching_color);

-        
+

         int delta_red = red - (matching_color.red >> 8);
         int delta_green = green - (matching_color.green >> 8);
         int delta_blue = blue - (matching_color.blue >> 8);
         int delta_red = red - (matching_color.red >> 8);
         int delta_green = green - (matching_color.green >> 8);
         int delta_blue = blue - (matching_color.blue >> 8);

-        
+

         int dist = delta_red * delta_red +
             delta_green * delta_green +
             delta_blue * delta_blue;
         int dist = delta_red * delta_red +
             delta_green * delta_green +
             delta_blue * delta_blue;

-        
+

         if (dist <= threshold)
         {
             // try to allocate a read-only colour...
         if (dist <= threshold)
         {
             // try to allocate a read-only colour...