/////////////////////////////////////////////////////////////////////////////
-// Name: palette.cpp
+// Name: src/motif/palette.cpp
// Purpose: wxPalette
// Author: Julian Smart
// Modified by:
/* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
I have implemented basic colormap support for the X11 versions of
-wxWindows, notably wxPalette::Create(). The way I did it is to
+wxWidgets, notably wxPalette::Create(). The way I did it is to
allocate additional read-only color cells in the default colormap. In
general you will get arbitrary pixel values assigned to these new
-cells and therefore I added a method wxColourMap::TransferBitmap()
+cells and therefore I added a method wxPalette::TransferBitmap()
which maps the pixel values 0..n to the real ones obtained with
Create(). This is only implemented for the popular case of 8-bit
depth.
not the functionality that wxPalette::Create() aims to provide.
*/
-#ifdef __GNUG__
-#pragma implementation "palette.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/palette.h"
#include "wx/window.h"
#endif
#include "wx/motif/private.h"
-#if !USE_SHARED_LIBRARIES
IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject)
-#endif
/*
* Palette
m_pix_array_n = 0;
m_pix_array = (unsigned long*) 0;
m_display = (WXDisplay*) 0;
- m_destroyable = FALSE;
+ m_destroyable = false;
}
wxPaletteRefData::wxPaletteRefData()
{
Display *display = (Display*) NULL;
- wxNode *node, *next;
+ wxList::compatibility_iterator node, next;
- for (node = m_palettes.First(); node; node = next) {
- wxXPalette *c = (wxXPalette *)node->Data();
+ for (node = m_palettes.GetFirst(); node; node = next) {
+ wxXPalette *c = (wxXPalette *)node->GetData();
unsigned long *pix_array = c->m_pix_array;
Colormap cmap = (Colormap) c->m_cmap;
bool destroyable = c->m_destroyable;
if (destroyable)
XFreeColormap(display, cmap);
- next = node->Next();
- m_palettes.DeleteNode(node);
+ next = node->GetNext();
+ m_palettes.Erase(node);
delete c;
}
}
UnRef();
if (!n) {
- return FALSE;
+ return false;
}
m_refData = new wxPaletteRefData;
pix_array = new unsigned long[n];
if (!pix_array)
- return FALSE;
+ return false;
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;
}
c->m_pix_array = pix_array;
c->m_cmap = (WXColormap) cmap;
c->m_display = (WXDisplay*) display;
- c->m_destroyable = FALSE;
+ c->m_destroyable = false;
M_PALETTEDATA->m_palettes.Append(c);
- 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 )
- return FALSE;
+ return wxNOT_FOUND;
// TODO
- return FALSE;
+ return wxNOT_FOUND;
}
bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const
{
if ( !m_refData )
- return FALSE;
+ return false;
if (index < 0 || index > 255)
- return FALSE;
+ return false;
// TODO
- return FALSE;
+ return false;
}
WXColormap wxPalette::GetXColormap(WXDisplay* display) const
{
- if (!M_PALETTEDATA || (M_PALETTEDATA->m_palettes.Number() == 0))
+ if (!M_PALETTEDATA || (M_PALETTEDATA->m_palettes.GetCount() == 0))
return wxTheApp->GetMainColormap(display);
- wxNode* node = M_PALETTEDATA->m_palettes.First();
+ wxList::compatibility_iterator node = M_PALETTEDATA->m_palettes.GetFirst();
if (!display && node)
{
- wxXPalette* p = (wxXPalette*) node->Data();
+ wxXPalette* p = (wxXPalette*) node->GetData();
return p->m_cmap;
}
while (node)
{
- wxXPalette* p = (wxXPalette*) node->Data();
+ wxXPalette* p = (wxXPalette*) node->GetData();
if (p->m_display == display)
return p->m_cmap;
- node = node->Next();
+ node = node->GetNext();
}
/* Make a new one: */
wxXPalette *c = new wxXPalette;
- wxXPalette *first = (wxXPalette *)M_PALETTEDATA->m_palettes.First()->Data();
+ wxXPalette *first =
+ (wxXPalette *)M_PALETTEDATA->m_palettes.GetFirst()->GetData();
XColor xcol;
int pix_array_n = first->m_pix_array_n;
c->m_pix_array = new unsigned long[pix_array_n];
c->m_display = display;
c->m_cmap = wxTheApp->GetMainColormap(display);
- c->m_destroyable = FALSE;
+ c->m_destroyable = false;
xcol.flags = DoRed | DoGreen | DoBlue;
int i;
for (i = 0; i < pix_array_n; i++)
{
xcol.pixel = first->m_pix_array[i];
- XQueryColor((Display*) first->m_display, (Colormap) first->m_cmap, &xcol);
+ XQueryColor((Display*) first->m_display,
+ (Colormap) first->m_cmap, &xcol);
c->m_pix_array[i] =
- (XAllocColor((Display*) display, (Colormap) c->m_cmap, &xcol) == 0) ? 0 : xcol.pixel;
+ (XAllocColor((Display*) display, (Colormap) c->m_cmap, &xcol) == 0)
+ ? 0 : xcol.pixel;
}
// wxPalette* nonConstThis = (wxPalette*) this;
uptr++;
}
- return TRUE;
+ return true;
}
default:
- return FALSE;
+ return false;
}
}
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++;
break;
}
default:
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
unsigned long *wxPalette::GetXPixArray(WXDisplay *display, int *n)
{
if (!M_PALETTEDATA)
return (unsigned long*) 0;
- wxNode *node;
+ wxList::compatibility_iterator node;
- for (node = M_PALETTEDATA->m_palettes.First(); node; node = node->Next())
+ for (node = M_PALETTEDATA->m_palettes.GetFirst(); node;
+ node = node->GetNext())
{
- wxXPalette *c = (wxXPalette *)node->Data();
+ wxXPalette *c = (wxXPalette *)node->GetData();
if (c->m_display == display)
{
if (n)
M_PALETTEDATA->m_palettes.Append(c);
}
-
projects / wxWidgets.git / blobdiff