Fix for always failing assert in GetValue. Save the same value that

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

diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp
index c7021da3036176e835fd605e00c4d24df246fcb6..378172ff5b06e79122042772bd81e2c569a708fe 100644 (file)
--- a/src/motif/palette.cpp
+++ b/src/motif/palette.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        src/motif/palette.cpp

 // Purpose:     wxPalette
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxPalette
 // Author:      Julian Smart
 // Modified by:


@@ -38,9 +38,12 @@ not the functionality that wxPalette::Create() aims to provide.
 #include "wx/wxprec.h"
 
 #include "wx/palette.h"
 #include "wx/wxprec.h"
 
 #include "wx/palette.h"

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -147,9 +150,9 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     pix_array_n = n;
     xcol.flags = DoRed | DoGreen | DoBlue;
     for(int i = 0; i < n; i++) {
     pix_array_n = n;
     xcol.flags = DoRed | DoGreen | DoBlue;
     for(int i = 0; i < n; i++) {

-        xcol.red = (unsigned short)red[i] << 8;
-        xcol.green = (unsigned short)green[i] << 8;
-        xcol.blue = (unsigned short)blue[i] << 8;
+        xcol.red = (unsigned short)(red[i] << 8);
+        xcol.green = (unsigned short)(green[i] << 8);
+        xcol.blue = (unsigned short)(blue[i] << 8);

         pix_array[i] = (XAllocColor(display, cmap, &xcol) == 0) ? 0 : xcol.pixel;
     }
 
         pix_array[i] = (XAllocColor(display, cmap, &xcol) == 0) ? 0 : xcol.pixel;
     }
 


@@ -165,13 +168,15 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     return true;
 }
 
     return true;
 }
 

-int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
+int wxPalette::GetPixel(unsigned char WXUNUSED(red),
+                        unsigned char WXUNUSED(green),
+                        unsigned char WXUNUSED(blue)) const

 {
     if ( !m_refData )
 {
     if ( !m_refData )

-        return false;
+        return wxNOT_FOUND;

 
     // TODO
 
     // TODO

-    return false;
+    return wxNOT_FOUND;

 }
 
 bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const
 }
 
 bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const


@@ -290,9 +295,9 @@ bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz,
         struct rgb24 { unsigned char r, g, b; } *dptr = (struct rgb24 *)dest;
         while(sz-- > 0) {
             if((int)*data < pix_array_n) {
         struct rgb24 { unsigned char r, g, b; } *dptr = (struct rgb24 *)dest;
         while(sz-- > 0) {
             if((int)*data < pix_array_n) {

-                dptr->r = pix_array[*data] & 0xFF;
-                dptr->g = (pix_array[*data] >> 8) & 0xFF;
-                dptr->b = (pix_array[*data] >> 16) & 0xFF;
+                dptr->r = (unsigned char)(pix_array[*data] & 0xFF);
+                dptr->g = (unsigned char)((pix_array[*data] >> 8) & 0xFF);
+                dptr->b = (unsigned char)((pix_array[*data] >> 16) & 0xFF);

             }
             data++;
             dptr++;
             }
             data++;
             dptr++;


@@ -356,4 +361,3 @@ void wxPalette::PutXColormap(WXDisplay* display, WXColormap cm, bool dp)
 
     M_PALETTEDATA->m_palettes.Append(c);
 }
 
     M_PALETTEDATA->m_palettes.Append(c);
 }

-