temporarily reverted binary backwards incompatible DoCreate to XmDoCreateTLW renaming

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index bdb45a57e02cb56af3585808b707a41ba322c9f1..1926409552aa405b884b92158458559273f57e0f 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -13,6 +13,7 @@
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"

+#include "wx/os2/private.h"

 
 class WXDLLEXPORT wxPalette;
 
 
 class WXDLLEXPORT wxPalette;
 


@@ -22,14 +23,14 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();

-protected:
+// protected:

     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;
 }; // end of CLASS wxPaletteRefData
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;
 }; // end of CLASS wxPaletteRefData
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
 {
     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; }
     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
 
 
     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_