more extra semicolons removed (patch 1303724)

[wxWidgets.git] / include / wx / mac / classic / palette.h

diff --git a/include/wx/mac/classic/palette.h b/include/wx/mac/classic/palette.h
index ad4a3d222db27a55f16f2e0e7d05f0f1d86773e4..04368cb846e2e320fbf306b37f8113ee313fee9a 100644 (file)
--- a/include/wx/mac/classic/palette.h
+++ b/include/wx/mac/classic/palette.h
@@ -6,16 +6,12 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "palette.h"
-#endif
-
 #include "wx/colour.h"
 #include "wx/gdiobj.h"
 
@@ -24,7 +20,7 @@ class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
     DECLARE_NO_COPY_CLASS(wxPaletteRefData)
-    
+
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
@@ -36,14 +32,14 @@ protected:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
   wxPalette();
   wxPalette(const wxPalette& palette)
-      : wxGDIObject()
+      : wxPaletteBase()
   { Ref(palette); }
 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
@@ -55,8 +51,8 @@ public:
   virtual bool Ok() 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; }
 
 /* TODO: implementation
   inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }