Toolbar/tooltip udates

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

diff --git a/include/wx/mac/palette.h b/include/wx/mac/palette.h
index c359654e79449215fdb55c4cee7f7096dae10ea5..8894340703043de6e03bba2b3d2feb9e9d231d65 100644 (file)
--- a/include/wx/mac/palette.h
+++ b/include/wx/mac/palette.h
@@ -16,19 +16,22 @@
 #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();
 protected:
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
 protected:

-               wxColour* m_palette;
-               wxInt32         m_count ;
+    wxColour* m_palette;
+    wxInt32   m_count ;

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


@@ -39,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();