no_rtti fix was not having correct eval order

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

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 7121430633ef67b08ccfa496e686d4c06c4de720..e78a9807417fedc72895f7f1a94b02bc21b9f674 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -72,7 +72,7 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
 }
 
 wxPalette::wxPalette(const wxPalette& palette)
-    : wxGDIObject()
+    : wxPaletteBase()
 {
     Ref(palette);
 }
@@ -122,14 +122,14 @@ bool wxPalette::Create(int n,
         e->blue = blue[i];
     }
 
-    return TRUE;
+    return true;
 }
 
 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
@@ -152,14 +152,14 @@ bool wxPalette::GetRGB(int pixel,
                        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;
-    return TRUE;
+    return true;
 }
 
 #endif // wxUSE_PALETTE