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 761efefa1095bdc6b3a80b6a49c4bd51c46a0005..bbeab7e7ddf3f04e4f0edf06d934383f22b14192 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -14,14 +14,14 @@
 
 #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;
 };
 protected:
  WXHPALETTE m_hPalette;
 };


@@ -30,26 +30,28 @@ protected:
 
 class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
 
 class WXDLLEXPORT wxPalette: public wxPaletteBase
 {

-  DECLARE_DYNAMIC_CLASS(wxPalette)
-

 public:
 public:

-  wxPalette(void);
-
-  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(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 bool Ok(void) const { return (m_refData != NULL) ; }
-
-  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; }
-
-  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)

 };
 
 #endif
 };
 
 #endif