X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dbd6262a9ee7d735fb3930707346298f71b2cb7..57fbe23f68f9ef92b8ef7e26bd06b399b53e33b2:/include/wx/mac/palette.h diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h index 3482b33934..420e0f16fc 100644 --- a/include/wx/mac/palette.h +++ b/include/wx/mac/palette.h @@ -12,24 +12,26 @@ #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(); -/* TODO: implementation protected: - WXHPALETTE m_hPalette; -*/ + wxColour* m_palette; + wxInt32 m_count ; }; #define M_PALETTEDATA ((wxPaletteRefData *)m_refData) @@ -40,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();