wxDC::StretchBlit() for wxMac and wxMSW (patch 1611973)

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

diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 0612ac12542d2c43f7537fe29e00b69315894b32..8babcd8f594517f5bc8fd495f65a50afb8bc42e7 100644 (file)
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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/list.h"
 
 #include "wx/gdiobj.h"
 #include "wx/list.h"
 


@@ -25,10 +21,10 @@ class WXDLLEXPORT wxPalette;
 class wxXPalette : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxXPalette)
 class wxXPalette : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxXPalette)

-        
+

 public:
     wxXPalette();
 public:
     wxXPalette();

-    
+

     WXDisplay*        m_display;
     int               m_pix_array_n;
     unsigned long*    m_pix_array;
     WXDisplay*        m_display;
     int               m_pix_array_n;
     unsigned long*    m_pix_array;


@@ -41,34 +37,30 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();

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

 protected:
     wxList  m_palettes;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 protected:
     wxList  m_palettes;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)

-        
+

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

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

     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() const { return (m_refData != NULL) ; }
-    
-    wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-    bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
-    bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
-    
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }
+

     // X-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;
     bool TransferBitmap(void *data, int depth, int size);
     // X-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;
     bool TransferBitmap(void *data, int depth, int size);