compilation fix for wxString::Format("no variadic arguments") and VC6

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index c940cbc3a6c9149e2b507fd0908360b10dcaeeb5..459403fc40a41dfd74160d0ba31a21abdb65f507 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -1,21 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/mgl/palette.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __WX_PALETTE_H__
 #define __WX_PALETTE_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "palette.h"
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"
@@ -25,40 +20,32 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
 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) const;
-    bool operator != (const wxPalette& palette) const;
-    bool Ok() const;
+    virtual ~wxPalette();
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() 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;
 
     // implementation
-    int GetColoursCount() const;   
-    // FIXME_MGL -- make this method standard part of wx API
-    // FIXME_MGL -- create wxXXXBase classes for all GDI stuff (Vadim wants that)
-    
+    virtual int GetColoursCount() const;
+
     palette_t *GetMGLpalette_t() const;
 };
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-
 #endif // __WX_PALETTE_H__