X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/x11/palette.cpp diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp index e03aed5237..dc3f06801d 100644 --- a/src/x11/palette.cpp +++ b/src/x11/palette.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: palette.cpp +// Name: src/x11/palette.cpp // Purpose: wxPalette // Author: Julian Smart // Modified by: @@ -34,10 +34,16 @@ recommended; only the window manager should do this... Also, it is not the functionality that wxPalette::Create() aims to provide. */ +// for compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/palette.h" -#include "wx/window.h" -#include "wx/app.h" -#include "wx/utils.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/window.h" +#endif #ifdef __VMS__ #pragma message disable nosimpint @@ -71,7 +77,7 @@ wxPaletteRefData::wxPaletteRefData() wxPaletteRefData::~wxPaletteRefData() { - Display *display = (Display*) NULL; + Display *display = NULL; wxList::compatibility_iterator node, next; @@ -164,13 +170,28 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre return true; } -int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const +wxGDIRefData *wxPalette::CreateGDIRefData() const +{ + return new wxPaletteRefData; +} + +wxGDIRefData * +wxPalette::CloneGDIRefData(const wxGDIRefData * WXUNUSED(data)) const +{ + wxFAIL_MSG( wxS("Cloning palettes is not implemented in wxX11.") ); + + return new wxPaletteRefData; +} + +int wxPalette::GetPixel(unsigned char WXUNUSED(red), + unsigned char WXUNUSED(green), + unsigned char WXUNUSED(blue)) const { if ( !m_refData ) - return FALSE; + return wxNOT_FOUND; // TODO - return FALSE; + return wxNOT_FOUND; } bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const @@ -351,4 +372,3 @@ void wxPalette::PutXColormap(WXDisplay* display, WXColormap cm, bool dp) M_PALETTEDATA->m_palettes.Append(c); } -