adding raster op hook

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

diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h
index b0753763e20e9263d4f0d83c4326d1812dd16920..690299c08cf9c9a8487866a8b31d869b4bcbd415 100644 (file)
--- a/include/wx/palmos/palette.h
+++ b/include/wx/palmos/palette.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.h
+// Name:        wx/palmos/palette.h

 // Purpose:     wxPalette class
 // Purpose:     wxPalette class

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #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"
 
 class WXDLLEXPORT wxPalette;
 #include "wx/gdiobj.h"
 
 class WXDLLEXPORT wxPalette;


@@ -25,41 +21,34 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData(void);
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData(void);

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

 protected:
  WXHPALETTE m_hPalette;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 protected:
  WXHPALETTE m_hPalette;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
   wxPalette(void);
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 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) ; }
+  virtual bool Ok() const { return IsOk(); }
+  virtual bool IsOk(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 FreeResource(bool force = FALSE);
+  virtual bool FreeResource(bool force = false);

 
   inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);
 };
 
 
   inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);
 };
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-

 #endif
     // _WX_PALETTE_H_
 #endif
     // _WX_PALETTE_H_