X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..c493691d6249650c0366fd9aaaca8572e3ff3edd:/include/wx/x11/palette.h

diff --git a/include/wx/x11/palette.h b/include/wx/x11/palette.h
index 5611a697b1..aaef465ffd 100644
--- a/include/wx/x11/palette.h
+++ b/include/wx/x11/palette.h
@@ -12,7 +12,7 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "palette.h"
 #endif
 
@@ -25,10 +25,10 @@ class WXDLLEXPORT wxPalette;
 class wxXPalette : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxXPalette)
-        
+
 public:
     wxXPalette();
-    
+
     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();
-    
+
 protected:
     wxList  m_palettes;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
     DECLARE_DYNAMIC_CLASS(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();
     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) ; }
-    
+
     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);