Updated version to 2.5.5

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 2c3024f584aa087aec8617526d3756308812b6ae..1926409552aa405b884b92158458559273f57e0f 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -6,7 +6,7 @@
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/12/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_


@@ -30,7 +30,7 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase

 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 


@@ -68,16 +68,13 @@ public:
     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
 
 
     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_
 
 #endif
     // _WX_PALETTE_H_