use WX_ASSERT_STR/SIZET_EQUAL instead of CPPUNIT_ASSERT_EQUAL with casts

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 473e2028645ad8d305defded82c910cf493f32f3..0f5d8a4f8715d99fb13e696b7b44e62558bf2a95 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -15,9 +15,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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


@@ -31,22 +34,17 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

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

 // Colour
 
 void wxColour::Init()
 {
     m_isInit = false;
 // Colour
 
 void wxColour::Init()
 {
     m_isInit = false;

-    m_red =
-    m_blue =
-    m_green = 0;
+    m_red = m_blue = m_green = 0;

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

-wxColour::wxColour()
-{
-    Init();
-}
-

 wxColour::wxColour(const wxColour& col)
 {
     *this = col;
 wxColour::wxColour(const wxColour& col)
 {
     *this = col;


@@ -62,47 +60,12 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& name)
-{
-    if ( wxTheColourDatabase )
-    {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
-    }
-
-    // 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 ) )
-    {
-        col.m_red = (unsigned char)(xcol.red & 0xff);
-        col.m_green = (unsigned char)(xcol.green & 0xff);
-        col.m_blue = (unsigned char)(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::InitRGBA(unsigned char r, unsigned char g, unsigned char b,
+                        unsigned char WXUNUSED(a))

 {
     m_red = r;
     m_green = g;
 {
     m_red = r;
     m_green = g;


@@ -119,7 +82,7 @@ void wxColour::Set(unsigned char r, unsigned char g, unsigned char b)
 // 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.
 
 // 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;


@@ -143,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;
     }
 }


@@ -178,14 +141,14 @@ 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);
 
     int numPixVals = XDisplayCells(display, DefaultScreen (display));
     int mindist = 256 * 256 * 3;
 {
     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));
+    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;