X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650291520681b5b5e3c2509838dd9f1f0392c84c..73302af6dddd667af4ebec69c800bc9de106f28e:/include/wx/os2/palette.h?ds=sidebyside

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 78d794277b..1926409552 100644
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -13,6 +13,7 @@
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"
+#include "wx/os2/private.h"
 
 class WXDLLEXPORT wxPalette;
 
@@ -29,7 +30,7 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
@@ -62,19 +63,18 @@ public:
     virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
     inline wxPalette& operator = (const wxPalette& rPalette) { if (*this == rPalette) return (*this); Ref(rPalette); return *this; }
-    inline bool       operator == (const wxPalette& rPalette) { return m_refData == rPalette.m_refData; }
-    inline bool       operator != (const wxPalette& rPalette) { return m_refData != rPalette.m_refData; }
+    inline bool       operator == (const wxPalette& rPalette) const
+        { return m_refData == rPalette.m_refData; }
+    inline bool       operator != (const wxPalette& rPalette) const
+        { return m_refData != rPalette.m_refData; }
 
-    virtual bool FreeResource(bool bForce = FALSE);
+    virtual bool FreeResource(bool bForce = false);
 
     inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
     void              SetHPALETTE(WXHPALETTE hPalette);
     void              SetPS(HPS hPS);
 }; // end of CLASS wxPalette
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-
 #endif
     // _WX_PALETTE_H_