oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index 589b7735e03dd1eb2811d70b39752a3d69d61b21..64403fb7ad95aad24dd8eb0017e0bd28e0926b5f 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -6,13 +6,13 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "palette.h"
 #endif
 
 #pragma interface "palette.h"
 #endif
 


@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPalette;
 // Palette for one display
 class wxXPalette : public wxObject
 {
 // Palette for one display
 class wxXPalette : public wxObject
 {

-DECLARE_DYNAMIC_CLASS(wxXPalette)
+    DECLARE_DYNAMIC_CLASS(wxXPalette)

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


@@ -49,34 +49,33 @@ protected:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 
 #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:
 
 public:

-  wxPalette();
-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
-  inline wxPalette(const wxPalette* palette) { UnRef(); if (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) ; }
-
-  inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
-
-  // Motif-specific
-  WXColormap GetXColormap(WXDisplay* display = NULL) const;
-  bool TransferBitmap(void *data, int depth, int size);
-  bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
-  unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
-  void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
+    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; }
+
+    // Motif-specific
+    WXColormap GetXColormap(WXDisplay* display = NULL) const;
+    bool TransferBitmap(void *data, int depth, int size);
+    bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
+    unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
+    void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);

 };
 
 #endif
 };
 
 #endif

-    // _WX_PALETTE_H_
+// _WX_PALETTE_H_