set eol-style

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

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index bddc8a334ce99cf78ca94196e6d1092977b0f433..bbeab7e7ddf3f04e4f0edf06d934383f22b14192 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -1,66 +1,58 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PALETTEH__
-#define __PALETTEH__
-
-#ifdef __GNUG__
-#pragma interface "palette.h"
-#endif
+#ifndef _WX_PALETTE_H_
+#define _WX_PALETTE_H_

 
 #include "wx/gdiobj.h"
 
 
 #include "wx/gdiobj.h"
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {

-    friend class WXDLLEXPORT wxPalette;
+    friend class WXDLLIMPEXP_FWD_CORE wxPalette;

 public:
     wxPaletteRefData(void);
 public:
     wxPaletteRefData(void);

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

 protected:
  WXHPALETTE m_hPalette;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 protected:
  WXHPALETTE m_hPalette;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxPalette)
-

 public:
 public:

-  wxPalette(void);
-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
-  inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); }
-
-  wxPalette(const int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  ~wxPalette(void);
-  bool Create(const 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(const int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
-
-  virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
-  inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
-
-  virtual bool FreeResource(bool force = FALSE);
-
-  inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-  void SetHPALETTE(WXHPALETTE pal);
+    wxPalette();
+    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    virtual ~wxPalette(void);
+    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    
+    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
+    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+
+    virtual int GetColoursCount() const;
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL) ; }
+
+    virtual bool FreeResource(bool force = false);
+
+    // implemetation
+    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
 #endif

-    // __PALETTEH__
+    // _WX_PALETTE_H_