Native wxControl::DoGetBestSize() implementation

[wxWidgets.git] / include / wx / msw / palette.h

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 510882fa18cc58420e50d5e29983da63309d47c4..7a0270a6aa8ab82a901d923e5c7a42665037e36b 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "palette.h"
 #endif
 
@@ -39,7 +39,6 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
 public:
   wxPalette(void);
   inline wxPalette(const wxPalette& palette) { Ref(palette); }
-  inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); }
 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette(void);
@@ -50,8 +49,8 @@ public:
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+  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);