adapting keycode field usage for EVT_CHAR in unicode to MSW variant (full unicode...

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

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index 9501928de31321acb22b4d38c68e26c3ba08f409..24900fc538548721c72e8a08ed153ee9fd6a67a6 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -3,16 +3,11 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "paletteg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -72,7 +67,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);
 }


@@ -88,12 +83,12 @@ wxPalette& wxPalette::operator = (const wxPalette& palette)
     return *this;
 }
 
     return *this;
 }
 

-bool wxPalette::operator == (const wxPalette& palette)
+bool wxPalette::operator == (const wxPalette& palette) const

 {
     return m_refData == palette.m_refData;
 }
 
 {
     return m_refData == palette.m_refData;
 }
 

-bool wxPalette::operator != (const wxPalette& palette)
+bool wxPalette::operator != (const wxPalette& palette) const

 {
     return m_refData != palette.m_refData;
 }
 {
     return m_refData != palette.m_refData;
 }


@@ -125,11 +120,11 @@ bool wxPalette::Create(int n,
     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) return false;
+    if (!m_refData) return wxNOT_FOUND;

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


@@ -163,5 +158,3 @@ bool wxPalette::GetRGB(int pixel,
 }
 
 #endif // wxUSE_PALETTE
 }
 
 #endif // wxUSE_PALETTE

-
-