adding wxArrayDouble for later use in graphics context APIs

[wxWidgets.git] / include / wx / generic / paletteg.h

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 2aa5b4259ed24d105ff4cb1f646db94febcceaf9..8de3db902911d2e73d4946cd1cb31d27d332b132 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/generic/paletteg.h
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __WX_PALETTEG_H__
 #define __WX_PALETTEG_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "paletteg.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
@@ -25,35 +21,30 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxPalette;
+class WXDLLIMPEXP_CORE wxPalette;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 
-class wxPalette: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
 {
-  DECLARE_DYNAMIC_CLASS(wxPalette)
-
-  public:
-
+public:
     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
-    wxPalette( const wxPalette& palette );
-    ~wxPalette();
-    wxPalette& operator = ( const wxPalette& palette );
-    bool operator == ( const wxPalette& palette );
-    bool operator != ( const wxPalette& palette );
-    bool Ok() const;
+    virtual ~wxPalette();
+    bool operator == ( const wxPalette& palette ) const;
+    bool operator != ( const wxPalette& palette ) const;
+    virtual bool Ok() const;
 
     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;
 
-    // no data
-};
+    virtual int GetColoursCount() const;
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)
+};
 
 #endif // __WX_PALETTEG_H__