[ 1936700 ] wxCAL_SHOW_WEEK_NUMBERS, slightly modified

[wxWidgets.git] / include / wx / mac / carbon / palette.h

diff --git a/include/wx/mac/carbon/palette.h b/include/wx/mac/carbon/palette.h
index 0532aed4e14c83aabc838e19c771c7e99a0bdb87..5c6aa4740f2006f03cfab9abff4a802dac683850 100644 (file)
--- a/include/wx/mac/carbon/palette.h
+++ b/include/wx/mac/carbon/palette.h
@@ -12,27 +12,11 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 

-#include "wx/colour.h"

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

-class WXDLLIMPEXP_FWD_CORE wxPalette;
-
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
-{
-    DECLARE_NO_COPY_CLASS(wxPaletteRefData)
-
-    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
-public:
-    wxPaletteRefData();
-    virtual ~wxPaletteRefData();
-protected:
-    wxColour* m_palette;
-    wxInt32   m_count ;
-};
-

 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
 public:
     wxPalette();
 {
 public:
     wxPalette();


@@ -40,18 +24,18 @@ public:
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     virtual ~wxPalette();
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     virtual ~wxPalette();
     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;
 
     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() const { return IsOk(); }
-    virtual bool IsOk() const { return (m_refData != NULL) ; }
-

     virtual int GetColoursCount() const;
     virtual int GetColoursCount() const;

-    
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 

-#endif
-    // _WX_PALETTE_H_
+#endif // _WX_PALETTE_H_