removed erroneous return type from a membersection (patch 905562)

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index a6a1287ff6471440fc67cef6b940dee1bec34cd9..a5c18f05e486ba71857280d6f85f3c3ece1f9e14 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -12,7 +12,7 @@
 //// 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "colour.h"
 #endif
 
 #pragma implementation "colour.h"
 #endif
 


@@ -20,108 +20,100 @@
 #include "wx/colour.h"
 #include "wx/app.h"
 
 #include "wx/colour.h"
 #include "wx/app.h"
 

+#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)
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

-#endif

 
 // 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 (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)
+{
+    *this = 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;
-}
-
-wxColour::wxColour (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;
-    }
-    else
-    {
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
-        m_isInit = FALSE;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
     }

-}

 
 

-wxColour::~wxColour ()
-{
+    // leave invalid
+    Init();

 }
 
 }
 

-wxColour& wxColour::operator = (const wxString& col)
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)

 {
 {

-    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
+    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 (*this);
+    return col;
+}
+
+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_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.
 
 // the existing one.
 // Returns the old or allocated pixel.
 


@@ -131,7 +123,7 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 int wxColour::AllocColour(WXDisplay* display, bool realloc)
 {
     if ((m_pixel != -1) && !realloc)
 int wxColour::AllocColour(WXDisplay* display, bool 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 ();


@@ -147,13 +139,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 = (int) color.pixel;
+        return m_pixel;

     }
 }
 
     }
 }
 


@@ -168,29 +160,29 @@ 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)
 {
     if (cmap == (Colormap) NULL)
 -------------------------------------------*/
 
 int wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap)
 {
     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;


@@ -211,8 +203,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)
         {