X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..41550985f202b60e7e50142113b19e633d578bf0:/include/wx/os2/palette.h?ds=sidebyside

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 0ffd177910..b489ec88e4 100644
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -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,10 +30,8 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxPaletteBase
+class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {
-    DECLARE_DYNAMIC_CLASS(wxPalette)
-
 public:
     wxPalette();
 
@@ -42,7 +40,7 @@ public:
               ,const unsigned char* pGreen
               ,const unsigned char* pBlue
              );
-    ~wxPalette();
+    virtual ~wxPalette();
 
     bool Create( int                  n
                 ,const unsigned char* pRed
@@ -59,18 +57,18 @@ public:
                 ,unsigned char* pBlue
                ) const;
 
-    virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
-    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);
 
     inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
     void              SetHPALETTE(WXHPALETTE hPalette);
     void              SetPS(HPS hPS);
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)
 }; // end of CLASS wxPalette
 
 #endif