X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e70f525fa60baefd9878758374b2019b804df82..613de0e89efab1cbf8463ea06e0cf0b2914fbce9:/include/wx/os2/palette.h

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 9d445157d1..b489ec88e4 100644
--- 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:
@@ -15,14 +15,14 @@
 #include "wx/gdiobj.h"
 #include "wx/os2/private.h"
 
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
 
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxPalette;
+    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 public:
     wxPaletteRefData();
-    ~wxPaletteRefData();
+    virtual ~wxPaletteRefData();
 // protected:
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;
@@ -30,29 +30,26 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {
-    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();
+    virtual ~wxPalette();
 
     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
@@ -60,24 +57,19 @@ public:
                 ,unsigned char* pBlue
                ) const;
 
-    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) 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
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)
+}; // end of CLASS wxPalette
 
 #endif
     // _WX_PALETTE_H_
-