change wxDataViewItem id to void*

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

diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h
index 0fff3043eada2dca95b469f01cc31bea1c3c9c31..668e05116fe9c8393219b346de14edab212e1c7e 100644 (file)
--- a/include/wx/palmos/palette.h
+++ b/include/wx/palmos/palette.h
@@ -12,20 +12,16 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "palette.h"
-#endif
-

 #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;
 };


@@ -38,19 +34,15 @@ class WXDLLEXPORT wxPalette: public wxPaletteBase
 
 public:
   wxPalette(void);
 
 public:
   wxPalette(void);

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

 
   wxPalette(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);

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

   bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   bool Create(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;
+  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;
 
   bool GetRGB(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) const { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk(void) const { return (m_refData != NULL) ; }

 
   virtual bool FreeResource(bool force = false);
 
 
   virtual bool FreeResource(bool force = false);