X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..bcdfb2cf30140e4c2b12b69632f5d6929b25662b:/src/gtk/palette.cpp diff --git a/src/gtk/palette.cpp b/src/gtk/palette.cpp index 9f49402c61..e3ae71acf2 100644 --- a/src/gtk/palette.cpp +++ b/src/gtk/palette.cpp @@ -15,6 +15,8 @@ #include "wx/palette.h" +#include "gdk/gdk.h" + //----------------------------------------------------------------------------- // wxPalette //----------------------------------------------------------------------------- @@ -22,22 +24,22 @@ class wxPaletteRefData: public wxObjectRefData { public: - + wxPaletteRefData(void); ~wxPaletteRefData(void); - + GdkColormap *m_colormap; }; -wxPaletteRefData::wxPaletteRefData(void) +wxPaletteRefData::wxPaletteRefData() { - m_colormap = (GdkColormap *) NULL; -}; + m_colormap = (GdkColormap *) NULL; +} -wxPaletteRefData::~wxPaletteRefData(void) +wxPaletteRefData::~wxPaletteRefData() { - if (m_colormap) gdk_colormap_unref( m_colormap ); -}; + if (m_colormap) gdk_colormap_unref( m_colormap ); +} //----------------------------------------------------------------------------- @@ -45,71 +47,73 @@ wxPaletteRefData::~wxPaletteRefData(void) IMPLEMENT_DYNAMIC_CLASS(wxPalette,wxGDIObject) -wxPalette::wxPalette(void) +wxPalette::wxPalette() { -}; +} wxPalette::wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue ) { - m_refData = new wxPaletteRefData(); - Create( n, red, green, blue ); -}; + m_refData = new wxPaletteRefData(); + Create( n, red, green, blue ); +} wxPalette::wxPalette( const wxPalette& palette ) { - Ref( palette ); -}; - -wxPalette::wxPalette( const wxPalette* palette ) -{ - UnRef(); - if (palette) Ref( *palette ); -}; + Ref( palette ); +} -wxPalette::~wxPalette(void) +wxPalette::~wxPalette() { -}; +} wxPalette& wxPalette::operator = ( const wxPalette& palette ) { - if (*this == palette) return (*this); - Ref( palette ); - return *this; -}; + if (*this == palette) return (*this); + Ref( palette ); + return *this; +} bool wxPalette::operator == ( const wxPalette& palette ) { - return m_refData == palette.m_refData; -}; + return m_refData == palette.m_refData; +} bool wxPalette::operator != ( const wxPalette& palette ) { - return m_refData != palette.m_refData; -}; + return m_refData != palette.m_refData; +} bool wxPalette::Ok(void) const { - return (m_refData); -}; + return (m_refData != NULL); +} -bool wxPalette::Create( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) +bool wxPalette::Create( int WXUNUSED(n), + const unsigned char *WXUNUSED(red), + const unsigned char *WXUNUSED(green), + const unsigned char *WXUNUSED(blue) ) { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(wxT("not implemented")); - return FALSE; -}; + return FALSE; +} -int wxPalette::GetPixel( const unsigned char red, const unsigned char green, const unsigned char blue ) const +int wxPalette::GetPixel( const unsigned char WXUNUSED(red), + const unsigned char WXUNUSED(green), + const unsigned char WXUNUSED(blue) ) const { - wxFAIL_MSG("not implemented"); + wxFAIL_MSG(wxT("not implemented")); - return 0; -}; + return 0; +} -bool wxPalette::GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const +bool wxPalette::GetRGB( int WXUNUSED(pixel), + unsigned char *WXUNUSED(red), + unsigned char *WXUNUSED(green), + unsigned char *WXUNUSED(blue) ) const { - wxFAIL_MSG("not implemented"); - - return 0; -}; + wxFAIL_MSG(wxT("not implemented")); + + return 0; +}