compatibility fix: have wxListKey ctors from C strings so that passing string literal...

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index bdb45a57e02cb56af3585808b707a41ba322c9f1..f6d7f0f92edb45cec77dd42957ab50e29d52d0b1 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.h
+// Name:        wx/os2/palette.h

 // Purpose:     wxPalette class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxPalette class
 // Author:      David Webster
 // Modified by:


@@ -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;
 


@@ -21,37 +22,36 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();

-    ~wxPaletteRefData();
-protected:
+    virtual ~wxPaletteRefData();
+// 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)
 
 public:
     wxPalette();
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
     wxPalette();

-    inline wxPalette(const wxPalette& rPalette) { Ref(rPalette); }

 
     wxPalette( int                  n
               ,const unsigned char* pRed
               ,const unsigned char* pGreen
               ,const unsigned char* pBlue
              );
 
     wxPalette( int                  n
               ,const unsigned char* pRed
               ,const unsigned char* pGreen
               ,const unsigned char* pBlue
              );

-    ~wxPalette();
+    virtual ~wxPalette();

 
     bool Create( int                  n
                 ,const unsigned char* pRed
                 ,const unsigned char* pGreen
                 ,const unsigned char* pBlue
                );
 
     bool Create( int                  n
                 ,const unsigned char* pRed
                 ,const unsigned char* pGreen
                 ,const unsigned char* pBlue
                );

-    int  GetPixel( const unsigned char cRed
-                  ,const unsigned char cGreen
-                  ,const unsigned char cBlue
+    int  GetPixel( unsigned char cRed
+                  ,unsigned char cGreen
+                  ,unsigned char cBlue

                  ) const;
     bool GetRGB( int            nPixel
                 ,unsigned char* pRed
                  ) const;
     bool GetRGB( int            nPixel
                 ,unsigned char* pRed


@@ -59,22 +59,15 @@ public:
                 ,unsigned char* pBlue
                ) const;
 
                 ,unsigned char* pBlue
                ) const;
 

-    virtual bool Ok(void) const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(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; }
-
-    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_

-