X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..759f72726133ce3bdbe1c3a2f444aa816c7f46c9:/src/motif/colour.cpp

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index c36d3b085c..780a1a2e33 100644
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -16,6 +16,9 @@
 #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/app.h"
@@ -34,29 +37,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // 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;
 }
 
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+wxColour::wxColour()
 {
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = TRUE;
-    m_pixel = -1;
+    Init();
 }
 
-wxColour::wxColour (const wxColour& col)
+wxColour::wxColour(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;
+    *this = col;
 }
 
 wxColour& wxColour::operator =(const wxColour& col)
@@ -69,41 +66,57 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)
 {
-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
+    if ( wxTheColourDatabase )
     {
-        m_red = the_colour->Red ();
-        m_green = the_colour->Green ();
-        m_blue = the_colour->Blue ();
-        m_pixel = the_colour->m_pixel;
-        m_isInit = TRUE;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }
     }
-    else
+
+    // leave invalid
+    Init();
+}
+
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)
+{
+    wxColour col;
+
+    Display *dpy = wxGlobalDisplay();
+    WXColormap colormap = wxTheApp->GetMainColormap( dpy );
+    XColor xcol;
+    if ( XParseColor( dpy, (Colormap)colormap, name.mb_str(), &xcol ) )
     {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
+        col.m_red = xcol.red & 0xff;
+        col.m_green = xcol.green & 0xff;
+        col.m_blue = xcol.blue & 0xff;
+        col.m_isInit = true;
+        col.m_pixel = -1;
     }
+
+    return col;
 }
 
-wxColour::~wxColour ()
+wxColour::~wxColour()
 {
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Set(unsigned char r, unsigned char g, unsigned char 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.
-// 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.
 
@@ -114,7 +127,7 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
 {
     if ((m_pixel != -1) && !realloc)
         return m_pixel;
-    
+
     XColor color;
     color.red = (unsigned short) Red ();
     color.red |= color.red << 8;
@@ -122,11 +135,11 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
     color.green |= color.green << 8;
     color.blue = (unsigned short) Blue ();
     color.blue |= color.blue << 8;
-    
+
     color.flags = DoRed | DoGreen | DoBlue;
-    
+
     WXColormap cmap = wxTheApp->GetMainColormap(display);
-    
+
     if (!XAllocColor ((Display*) display, (Colormap) cmap, &color))
     {
         m_pixel = wxGetBestMatchingPixel((Display*) display, &color,(Colormap) cmap);
@@ -173,7 +186,7 @@ int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap
 {
     if (cmap == (Colormap) NULL)
         cmap = (Colormap) wxTheApp->GetMainColormap(display);
-    
+
     int numPixVals = XDisplayCells(display, DefaultScreen (display));
     int mindist = 256 * 256 * 3;
     int bestpixel = (int) BlackPixel (display, DefaultScreen (display));
@@ -181,21 +194,21 @@ int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap
     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);
-        
+
         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;
-        
+
         if (dist <= threshold)
         {
             // try to allocate a read-only colour...