Only give capture to wxPopupTransientWindow child if it's the only one.

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

diff --git a/src/motif/colour.cpp b/src/motif/colour.cpp
index 32c0d39b78a3236fc1b4285e0d0008972601d38a..3dfe165e0b666199a48b2d940eb33b0e0c213988 100644 (file)
--- a/src/motif/colour.cpp
+++ b/src/motif/colour.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -32,16 +31,14 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
+wxCOMPILE_TIME_ASSERT( sizeof(WXPixel) == sizeof(Pixel), PixelSizeIsOk );
 
 // Colour
 
 void wxColour::Init()
 {
     m_isInit = false;
-    m_red =
-    m_blue =
-    m_green = 0;
+    m_red = m_blue = m_green = 0;
     m_pixel = -1;
 }
 
@@ -82,7 +79,7 @@ void wxColour::InitRGBA(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.
 
-int wxColour::AllocColour(WXDisplay* display, bool realloc)
+WXPixel wxColour::AllocColour(WXDisplay* display, bool realloc)
 {
     if ((m_pixel != -1) && !realloc)
         return m_pixel;
@@ -106,7 +103,7 @@ int wxColour::AllocColour(WXDisplay* display, bool realloc)
     }
     else
     {
-        m_pixel = (int) color.pixel;
+        m_pixel = (WXPixel) color.pixel;
         return m_pixel;
     }
 }
@@ -141,14 +138,14 @@ A read-only colour will not change.
   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;
-    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;