Fix warning.

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 67c40ced5400ef64dd7e6d1302f9ad81e82ec8d4..61a885cbddc7dff21901198fdda7ad54fd104ea8 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.cpp
+// Name:        src/x11/palette.cpp

 // Purpose:     wxPalette
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxPalette
 // Author:      Julian Smart
 // Modified by:


@@ -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,14 +34,16 @@ 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__
-#pragma implementation "palette.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/palette.h"
 
 #include "wx/palette.h"

-#include "wx/window.h"
-#include "wx/app.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/window.h"
+#endif

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -66,7 +68,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()


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

-        
+

         if (destroyable)
             XFreeColormap(display, cmap);
 
         if (destroyable)
             XFreeColormap(display, cmap);
 


@@ -129,7 +131,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 +147,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,31 +164,31 @@ 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(unsigned char red, unsigned char green, unsigned char blue) const

 {
     if ( !m_refData )
 {
     if ( !m_refData )

-        return FALSE;
+        return wxNOT_FOUND;

 
     // TODO
 
     // 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 )
 }
 
 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


@@ -219,7 +221,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 +255,10 @@ bool wxPalette::TransferBitmap(void *data, int depth, int size)
                 uptr++;
             }
 
                 uptr++;
             }
 

-            return TRUE;
+            return true;

         }
     default:
         }
     default:

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -310,9 +312,9 @@ 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)
 }
 
 unsigned long *wxPalette::GetXPixArray(WXDisplay *display, int *n)


@@ -355,4 +357,3 @@ void wxPalette::PutXColormap(WXDisplay* display, WXColormap cm, bool dp)
 
     M_PALETTEDATA->m_palettes.Append(c);
 }
 
     M_PALETTEDATA->m_palettes.Append(c);
 }

-