Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Removed some deprecated usage

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-03-19 17:24:06 +00:00
parent 9750481f36
commit 09a1dffa32
8 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/x11/palette.cpp
View File

@@ -79,8 +79,8 @@ wxPaletteRefData::~wxPaletteRefData()
wxNode *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;
@@ -105,7 +105,7 @@ wxPaletteRefData::~wxPaletteRefData()
if (destroyable)
XFreeColormap(display, cmap);
next = node->Next();
next = node->GetNext();
m_palettes.DeleteNode(node);
delete c;
}
@@ -191,27 +191,27 @@ bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *W
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();
wxNode* 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;
@@ -321,9 +321,9 @@ unsigned long *wxPalette::GetXPixArray(WXDisplay *display, int *n)
return (unsigned long*) 0;
wxNode *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)