X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..93c2f401e9955dc37df1f8dbfea7881c676b8ddb:/include/wx/msw/palette.h diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 3eaa3ac4ef..6179d35006 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -6,13 +6,13 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PALETTE_H_ #define _WX_PALETTE_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "palette.h" #endif @@ -38,7 +38,7 @@ class WXDLLEXPORT wxPalette: public wxGDIObject public: wxPalette(void); - inline wxPalette(const wxPalette& palette) { Ref(palette); } + inline wxPalette(const wxPalette& palette) : wxGDIObject(palette) { Ref(palette); } wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue); ~wxPalette(void); @@ -52,7 +52,7 @@ public: inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } - virtual bool FreeResource(bool force = FALSE); + virtual bool FreeResource(bool force = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } void SetHPALETTE(WXHPALETTE pal);