cache results of Motif 2 and Motif-is-Lesstif tests

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

diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 975ec7584ce3f0bd9f789b43f70158c8223dc209..aaef465ffdaee83421c2de242dd748080179c3d2 100644 (file)
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -25,10 +25,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;


@@ -42,33 +42,33 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
 public:
     wxPaletteRefData();
     ~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();
     wxPalette(const wxPalette& palette) { Ref(palette); }
 public:
     wxPalette();
     wxPalette(const wxPalette& palette) { Ref(palette); }

-    
+

     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     ~wxPalette();
     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;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
     wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
     ~wxPalette();
     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;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;

-    
+

     virtual bool Ok() const { return (m_refData != NULL) ; }
     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; }
     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; }

-    
+

     // 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);