implemented Freeze/Thaw() (patch 922156)

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 7a035ffd1835b3b80df70fe03803db21cfa7b2e0..c95becb4b9b64df84b8b99392295ba297b220b4a 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -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
 
@@ -77,7 +77,7 @@ wxPaletteRefData::~wxPaletteRefData()
 {
     Display *display = (Display*) NULL;
 
-    wxNode *node, *next;
+    wxList::compatibility_iterator node, next;
 
     for (node = m_palettes.GetFirst(); node; node = next) {
         wxXPalette *c = (wxXPalette *)node->GetData();
@@ -106,7 +106,7 @@ wxPaletteRefData::~wxPaletteRefData()
             XFreeColormap(display, cmap);
 
         next = node->GetNext();
-        m_palettes.DeleteNode(node);
+        m_palettes.Erase(node);
         delete c;
     }
 }
@@ -194,7 +194,7 @@ WXColormap wxPalette::GetXColormap(WXDisplay* display) const
     if (!M_PALETTEDATA || (M_PALETTEDATA->m_palettes.GetCount() == 0))
         return wxTheApp->GetMainColormap(display);
 
-    wxNode* node = M_PALETTEDATA->m_palettes.GetFirst();
+    wxList::compatibility_iterator node = M_PALETTEDATA->m_palettes.GetFirst();
     if (!display && node)
     {
         wxXPalette* p = (wxXPalette*) node->GetData();
@@ -319,7 +319,7 @@ 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.GetFirst(); node; node = node->GetNext())
     {