X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/078cf5cb756c4f4113d7acf04ebd6a2535ef75b3..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/msw/palette.h?ds=sidebyside

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 47c8dc83c7..7d0cacec6a 100644
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/msw/palette.h
 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
@@ -12,54 +12,40 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "palette.h"
-#endif
-
 #include "wx/gdiobj.h"
 
-class WXDLLEXPORT wxPalette;
-
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
 {
-    friend class WXDLLEXPORT wxPalette;
 public:
-    wxPaletteRefData(void);
-    ~wxPaletteRefData(void);
-protected:
- WXHPALETTE m_hPalette;
-};
+    wxPalette() { }
+    wxPalette(int n,
+              const unsigned char *red, const unsigned char *green, const unsigned char *blue)
+    {
+        Create(n, red, green, blue);
+    }
 
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
+    bool Create(int n,
+                const unsigned char *red, const unsigned char *green, const unsigned char *blue);
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
-{
-  DECLARE_DYNAMIC_CLASS(wxPalette)
+    virtual int GetColoursCount() const;
 
-public:
-  wxPalette(void);
-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
-
-  wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  ~wxPalette(void);
-  bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;
-  bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    int
+    GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
 
-  virtual bool Ok(void) const { return (m_refData != NULL) ; }
+    bool
+    GetRGB(int pixel,
+           unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
-  inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
+    // implemetation
+    WXHPALETTE GetHPALETTE() const;
+    void SetHPALETTE(WXHPALETTE pal);
 
-  virtual bool FreeResource(bool force = false);
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
-  inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-  void SetHPALETTE(WXHPALETTE pal);
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-
-#endif
-    // _WX_PALETTE_H_
+#endif // _WX_PALETTE_H_