fix typo in drawing slider ticks; added assert to check for it (slightly modified...

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

diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h
index 3482b339341aa25b7df0f354f1ed9f7b0f998b68..420e0f16fcde4792950f612b6a5b0fb4e5926449 100644 (file)
--- a/include/wx/mac/palette.h
+++ b/include/wx/mac/palette.h
@@ -12,24 +12,26 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "palette.h"
 #endif
 
 #pragma interface "palette.h"
 #endif
 

+#include "wx/colour.h"

 #include "wx/gdiobj.h"
 
 class WXDLLEXPORT wxPalette;
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
 #include "wx/gdiobj.h"
 
 class WXDLLEXPORT wxPalette;
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {

+    DECLARE_NO_COPY_CLASS(wxPaletteRefData)
+    

     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();

-/* TODO: implementation

 protected:
 protected:

- WXHPALETTE m_hPalette;
-*/
+    wxColour* m_palette;
+    wxInt32   m_count ;

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


@@ -40,7 +42,9 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
 
 public:
   wxPalette();
 
 public:
   wxPalette();

-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
+  wxPalette(const wxPalette& palette)
+      : wxGDIObject()
+  { Ref(palette); }

 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette();
 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette();