missing commit

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 9963f79b6b7b9444ad632eeeab872d63fbfcf4ef..05d1a89e9b814393bf5157f9f5f363c2596d209a 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -1,123 +1,97 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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.
 

-#ifdef __GNUG__
-#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
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-#endif
+wxCOMPILE_TIME_ASSERT( sizeof(WXPixel) == sizeof(Pixel), PixelSizeIsOk );

 
 // Colour
 
 
 // Colour
 

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

 {
 {

-    m_isInit = FALSE;
+    m_isInit = false;

     m_red = m_blue = m_green = 0;
     m_pixel = -1;
 }
 
     m_red = m_blue = m_green = 0;
     m_pixel = -1;
 }
 

-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+wxColour::wxColour(const wxColour& col)

 {
 {

-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-    m_pixel = -1;
+    *this = col;

 }
 
 }
 

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

 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
     m_pixel = col.m_pixel;
 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
     m_pixel = col.m_pixel;

+    return *this;

 }
 
 }
 

-wxColour& wxColour::operator =(const wxColour& col)
-{
-  m_red = col.m_red;
-  m_green = col.m_green;
-  m_blue = col.m_blue;
-  m_isInit = col.m_isInit;
-  m_pixel = col.m_pixel;
-  return *this;
-}
-
-void wxColour::InitFromName(const wxString& col)
-{
-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
-    {
-        m_red = the_colour->Red ();
-        m_green = the_colour->Green ();
-        m_blue = the_colour->Blue ();
-        m_pixel = the_colour->m_pixel;
-        m_isInit = TRUE;
-    }
-    else
-    {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
-    }
-}
-
-wxColour::~wxColour ()
+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)
 {
     if ((m_pixel != -1) && !realloc)

-       return m_pixel;
+        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;
 


@@ -125,13 +99,13 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
 
     if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
     {
 
     if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
     {

-       m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);
-       return m_pixel;
+        m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);
+        return m_pixel;

     }
     else
     {
     }
     else
     {

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

     }
 }
 
     }
 }
 


@@ -146,33 +120,33 @@ But in many cases, that is still better than always using black.
 Chris Breeze <chris@hel.co.uk>
 Improvements:
 1) More efficient calculation of RGB distance of colour cell from
 Chris Breeze <chris@hel.co.uk>
 Improvements:
 1) More efficient calculation of RGB distance of colour cell from

-   the desired colour. There is no need to take the sqrt of 'dist', and
-   since we are only interested in the top 8-bits of R, G and B we
-   can perform integer arithmetic.
+the desired colour. There is no need to take the sqrt of 'dist', and
+since we are only interested in the top 8-bits of R, G and B we
+can perform integer arithmetic.

 2) Attempt to allocate a read-only colour when a close match is found.
 2) Attempt to allocate a read-only colour when a close match is found.

-   A read-only colour will not change.
+A read-only colour will not change.

 3) Fall back to the closest match if no read-only colours are available.
 
 3) Fall back to the closest match if no read-only colours are available.
 

-Possible further improvements:
-1) Scan the lookup table and sort the colour cells in order of
-increasing
-   distance from the desired colour. Then attempt to allocate a
-read-only
-   colour starting from the nearest match.
-2) Linear RGB distance is not a particularly good method of colour
-matching
-   (though it is quick). Converting the colour to HLS and then comparing
-   may give better matching.
+  Possible further improvements:
+  1) Scan the lookup table and sort the colour cells in order of
+  increasing
+  distance from the desired colour. Then attempt to allocate a
+  read-only
+  colour starting from the nearest match.
+  2) Linear RGB distance is not a particularly good method of colour
+  matching
+  (though it is quick). Converting the colour to HLS and then comparing
+  may give better matching.

 -------------------------------------------*/
 
 -------------------------------------------*/
 

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

 {
     if (cmap == (Colormap) NULL)
 {
     if (cmap == (Colormap) NULL)

-      cmap = (Colormap) wxTheApp->GetMainColormap(display);
+        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;
     int red = desiredColor->red >> 8;
     int green = desiredColor->green >> 8;
     int blue = desiredColor->blue >> 8;


@@ -189,8 +163,8 @@ int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap
         int delta_blue = blue - (matching_color.blue >> 8);
 
         int dist = delta_red * delta_red +
         int delta_blue = blue - (matching_color.blue >> 8);
 
         int dist = delta_red * delta_red +

-                   delta_green * delta_green +
-                   delta_blue * delta_blue;
+            delta_green * delta_green +
+            delta_blue * delta_blue;

 
         if (dist <= threshold)
         {
 
         if (dist <= threshold)
         {