[ 1522988 ] Keypress causes crash in combo sample

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

diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp
index bc604731437693b6a4cfdbc8653458883f4e1fc3..6ccfde5439104ddb7b0710151f03aa3b294a374b 100644 (file)
--- a/src/generic/paletteg.cpp
+++ b/src/generic/paletteg.cpp
@@ -3,7 +3,7 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////


@@ -66,23 +66,10 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green
     Create(n, red, green, blue);
 }
 
     Create(n, red, green, blue);
 }
 

-wxPalette::wxPalette(const wxPalette& palette)
-    : wxPaletteBase()
-{
-    Ref(palette);
-}
-

 wxPalette::~wxPalette()
 {
 }
 
 wxPalette::~wxPalette()
 {
 }
 

-wxPalette& wxPalette::operator = (const wxPalette& palette)
-{
-    if (*this == palette) return (*this);
-    Ref(palette);
-    return *this;
-}
-

 bool wxPalette::operator == (const wxPalette& palette) const
 {
     return m_refData == palette.m_refData;
 bool wxPalette::operator == (const wxPalette& palette) const
 {
     return m_refData == palette.m_refData;


@@ -120,11 +107,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


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

-
-