check for NULL pointer in OnMeasureItem() as well as in OnDrawItem()

[wxWidgets.git] / src / generic / paletteg.cpp

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 336afdc2bae79fcbd0aa5feee72cf8b5fd99a607..e78a9807417fedc72895f7f1a94b02bc21b9f674 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -4,12 +4,12 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:       wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

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

 #pragma implementation "paletteg.h"
 #endif
 
 #pragma implementation "paletteg.h"
 #endif
 


@@ -72,7 +72,7 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
 }
 
 wxPalette::wxPalette(const wxPalette& palette)
 }
 
 wxPalette::wxPalette(const wxPalette& palette)

-    : wxGDIObject()
+    : wxPaletteBase()

 {
     Ref(palette);
 }
 {
     Ref(palette);
 }


@@ -122,14 +122,14 @@ bool wxPalette::Create(int n,
         e->blue = blue[i];
     }
 
         e->blue = blue[i];
     }
 

-    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
 {

-    if (!m_refData) return FALSE;
+    if (!m_refData) return false;

 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256
 
     int closest = 0;
     double d,distance = 1000.0; // max. dist is 256


@@ -152,14 +152,14 @@ bool wxPalette::GetRGB(int pixel,
                        unsigned char *green,
                        unsigned char *blue) const
 {
                        unsigned char *green,
                        unsigned char *blue) const
 {

-    if (!m_refData) return FALSE;
-    if (pixel >= M_PALETTEDATA->m_count) return FALSE;
+    if (!m_refData) return false;
+    if (pixel >= M_PALETTEDATA->m_count) return false;

 
     wxPaletteEntry& p = M_PALETTEDATA->m_entries[pixel];
     if (red) *red = p.red;
     if (green) *green = p.green;
     if (blue) *blue = p.blue;
 
     wxPaletteEntry& p = M_PALETTEDATA->m_entries[pixel];
     if (red) *red = p.red;
     if (green) *green = p.green;
     if (blue) *blue = p.blue;

-    return TRUE;
+    return true;

 }
 
 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE