X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28dfea7754424218398d2a7bd4e6bbbd253d7933..964c139b0738b6e4999cc7a651cfd8923dc981b1:/src/generic/paletteg.cpp diff --git a/src/generic/paletteg.cpp b/src/generic/paletteg.cpp index e78a980741..ac8cd8a83b 100644 --- a/src/generic/paletteg.cpp +++ b/src/generic/paletteg.cpp @@ -3,16 +3,11 @@ // Purpose: // Author: Robert Roebling // Created: 01/02/97 -// Id: +// RCS-ID: $Id$ // 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" @@ -38,7 +33,7 @@ class wxPaletteRefData: public wxObjectRefData public: wxPaletteRefData(void); - ~wxPaletteRefData(void); + virtual ~wxPaletteRefData(void); int m_count; wxPaletteEntry *m_entries; @@ -71,36 +66,21 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green Create(n, red, green, blue); } -wxPalette::wxPalette(const wxPalette& palette) - : wxPaletteBase() -{ - Ref(palette); -} - wxPalette::~wxPalette() { } -wxPalette& wxPalette::operator = (const wxPalette& palette) -{ - if (*this == palette) return (*this); - Ref(palette); - return *this; -} - -bool wxPalette::operator == (const wxPalette& palette) +bool wxPalette::IsOk() const { - return m_refData == palette.m_refData; -} - -bool wxPalette::operator != (const wxPalette& palette) -{ - return m_refData != palette.m_refData; + return (m_refData != NULL); } -bool wxPalette::Ok(void) const +int wxPalette::GetColoursCount() const { - return (m_refData != NULL); + if (m_refData) + return M_PALETTEDATA->m_count; + + return 0; } bool wxPalette::Create(int n, @@ -125,11 +105,11 @@ bool wxPalette::Create(int n, 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 @@ -163,5 +143,3 @@ bool wxPalette::GetRGB(int pixel, } #endif // wxUSE_PALETTE - -