Warning fix.

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 7a035ffd1835b3b80df70fe03803db21cfa7b2e0..9da4df9aa4f2f128c0165053a024031a6f000e5c 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -20,10 +20,10 @@
 
 /* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
 I have implemented basic colormap support for the X11 versions of
 
 /* 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
 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.
 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.
  */
 
 not the functionality that wxPalette::Create() aims to provide.
  */
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "palette.h"
 #endif
 
 #pragma implementation "palette.h"
 #endif
 


@@ -66,7 +66,7 @@ wxXPalette::wxXPalette()
     m_pix_array_n = 0;
     m_pix_array = (unsigned long*) 0;
     m_display = (WXDisplay*) 0;
     m_pix_array_n = 0;
     m_pix_array = (unsigned long*) 0;
     m_display = (WXDisplay*) 0;

-    m_destroyable = FALSE;
+    m_destroyable = false;

 }
 
 wxPaletteRefData::wxPaletteRefData()
 }
 
 wxPaletteRefData::wxPaletteRefData()


@@ -77,7 +77,7 @@ wxPaletteRefData::~wxPaletteRefData()
 {
     Display *display = (Display*) NULL;
 
 {
     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();
 
     for (node = m_palettes.GetFirst(); node; node = next) {
         wxXPalette *c = (wxXPalette *)node->GetData();


@@ -101,12 +101,12 @@ wxPaletteRefData::~wxPaletteRefData()
 #endif
             delete [] pix_array;
         }
 #endif
             delete [] pix_array;
         }

-        
+

         if (destroyable)
             XFreeColormap(display, cmap);
 
         next = node->GetNext();
         if (destroyable)
             XFreeColormap(display, cmap);
 
         next = node->GetNext();

-        m_palettes.DeleteNode(node);
+        m_palettes.Erase(node);

         delete c;
     }
 }
         delete c;
     }
 }


@@ -129,7 +129,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre
     UnRef();
 
     if (!n) {
     UnRef();
 
     if (!n) {

-        return FALSE;
+        return false;

     }
 
     m_refData = new wxPaletteRefData;
     }
 
     m_refData = new wxPaletteRefData;


@@ -145,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)
 
     pix_array = new unsigned long[n];
     if (!pix_array)

-        return FALSE;
+        return false;

 
     pix_array_n = n;
     xcol.flags = DoRed | DoGreen | DoBlue;
 
     pix_array_n = n;
     xcol.flags = DoRed | DoGreen | DoBlue;


@@ -162,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_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);
 
     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(const unsigned char red, const unsigned char green, const unsigned char blue) const


@@ -180,13 +180,13 @@ 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 )
 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)
 
     if (index < 0 || index > 255)

-        return FALSE;
+        return false;

 
     // TODO
 
     // TODO

-    return FALSE;
+    return false;

 }
 
 WXColormap wxPalette::GetXColormap(WXDisplay* display) const
 }
 
 WXColormap wxPalette::GetXColormap(WXDisplay* display) const


@@ -194,7 +194,7 @@ WXColormap wxPalette::GetXColormap(WXDisplay* display) const
     if (!M_PALETTEDATA || (M_PALETTEDATA->m_palettes.GetCount() == 0))
         return wxTheApp->GetMainColormap(display);
 
     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();
     if (!display && node)
     {
         wxXPalette* p = (wxXPalette*) node->GetData();


@@ -219,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_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;
 
     xcol.flags = DoRed | DoGreen | DoBlue;
     int i;


@@ -253,10 +253,10 @@ bool wxPalette::TransferBitmap(void *data, int depth, int size)
                 uptr++;
             }
 
                 uptr++;
             }
 

-            return TRUE;
+            return true;

         }
     default:
         }
     default:

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -310,16 +310,16 @@ bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz,
         break;
              }
     default:
         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;
 }
 
 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())
     {
 
     for (node = M_PALETTEDATA->m_palettes.GetFirst(); node; node = node->GetNext())
     {