include wx/object.h now that wxConfigBase derives from wxObject

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

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index cf198a273fa0e99c2f60de896451d35721d4ddbd..47b0ae7c05b335eac140e646b517f4af1dc6f37e 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxPalette class
 // Author:      Julian Smart
 // Modified by:


@@ -12,10 +12,6 @@
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 

-#ifdef __GNUG__
-#pragma interface "palette.h"
-#endif
-

 #include "wx/gdiobj.h"
 #include "wx/list.h"
 
 #include "wx/gdiobj.h"
 #include "wx/list.h"
 


@@ -24,7 +20,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();


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

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

 
 protected:
     wxList  m_palettes;
 
 protected:
     wxList  m_palettes;


@@ -49,33 +45,29 @@ 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();
-  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) { return m_refData == palette.m_refData; }
-  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(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    virtual ~wxPalette();
+    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
+    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;
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }
+
+    // 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_