SetTextColour is gone

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 3e90e0568234a640491b32fd3c7543bce69bd5a8..e7312893fde4891a56626bb86b88f0c5880a3ab8 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();

-    ~wxPaletteRefData();
+    virtual ~wxPaletteRefData();

 // protected:
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;
 // protected:
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;


@@ -36,14 +36,13 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
 
 public:
     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
 
     bool Create( int                  n
                 ,const unsigned char* pRed


@@ -60,9 +59,9 @@ 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) const
         { return m_refData == rPalette.m_refData; }
     inline bool       operator != (const wxPalette& rPalette) const
     inline bool       operator == (const wxPalette& rPalette) const
         { return m_refData == rPalette.m_refData; }
     inline bool       operator != (const wxPalette& rPalette) const