X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..997176a34641a870b1f6c6102e30f64f86b4122a:/include/wx/mac/palette.h diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h index c359654e79..56962e91f3 100644 --- a/include/wx/mac/palette.h +++ b/include/wx/mac/palette.h @@ -1,34 +1,37 @@ ///////////////////////////////////////////////////////////////////////////// // Name: palette.h // Purpose: wxPalette class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "palette.h" #endif +#include "wx/colour.h" #include "wx/gdiobj.h" class WXDLLEXPORT wxPalette; class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData { + DECLARE_NO_COPY_CLASS(wxPaletteRefData) + friend class WXDLLEXPORT wxPalette; public: wxPaletteRefData(); ~wxPaletteRefData(); protected: - wxColour* m_palette; - wxInt32 m_count ; + wxColour* m_palette; + wxInt32 m_count ; }; #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) @@ -39,7 +42,9 @@ class WXDLLEXPORT wxPalette: public wxGDIObject public: wxPalette(); - inline wxPalette(const wxPalette& palette) { Ref(palette); } + wxPalette(const wxPalette& palette) + : wxGDIObject() + { Ref(palette); } wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); ~wxPalette();