X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..222702b112dcc7bebe018d6f4d66fe469fefd02c:/src/x11/palette.cpp diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp index ef2b2597a6..9da4df9aa4 100644 --- a/src/x11/palette.cpp +++ b/src/x11/palette.cpp @@ -20,10 +20,10 @@ /* Wolfram Gloger 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. @@ -34,7 +34,7 @@ recommended; only the window manager should do this... Also, it is not the functionality that wxPalette::Create() aims to provide. */ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "palette.h" #endif @@ -46,11 +46,11 @@ not the functionality that wxPalette::Create() aims to provide. #ifdef __VMS__ #pragma message disable nosimpint #endif -#include + #ifdef __VMS__ #pragma message enable nosimpint #endif -#include "wx/motif/private.h" +#include "wx/x11/private.h" IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject) IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject) @@ -66,7 +66,7 @@ wxXPalette::wxXPalette() m_pix_array_n = 0; m_pix_array = (unsigned long*) 0; m_display = (WXDisplay*) 0; - m_destroyable = FALSE; + m_destroyable = false; } wxPaletteRefData::wxPaletteRefData() @@ -77,10 +77,10 @@ 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; @@ -89,6 +89,7 @@ wxPaletteRefData::~wxPaletteRefData() if (pix_array_n > 0) { +#if !wxUSE_NANOX // XFreeColors(display, cmap, pix_array, pix_array_n, 0); // Be careful not to free '0' pixels... int i, j; @@ -97,14 +98,15 @@ wxPaletteRefData::~wxPaletteRefData() if(j > i) XFreeColors(display, cmap, &pix_array[i], j-i, 0); while(jNext(); - m_palettes.DeleteNode(node); + next = node->GetNext(); + m_palettes.Erase(node); delete c; } } @@ -127,7 +129,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre UnRef(); if (!n) { - return FALSE; + return false; } m_refData = new wxPaletteRefData; @@ -143,7 +145,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre pix_array = new unsigned long[n]; if (!pix_array) - return FALSE; + return false; pix_array_n = n; xcol.flags = DoRed | DoGreen | DoBlue; @@ -160,10 +162,10 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre 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 @@ -178,38 +180,38 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons 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; @@ -217,7 +219,7 @@ WXColormap wxPalette::GetXColormap(WXDisplay* display) const 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; @@ -251,10 +253,10 @@ bool wxPalette::TransferBitmap(void *data, int depth, int size) uptr++; } - return TRUE; + return true; } default: - return FALSE; + return false; } } @@ -308,20 +310,20 @@ bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz, 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)