Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index 245db236a30a6133c22963b77c0635dbbf2a977f..f134955bc4d67f8d1ef9128c98a8100a431c164c 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,7 +12,7 @@
 #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
 


@@ -32,7 +32,7 @@ struct palette_t;
 // wxPalette
 //-----------------------------------------------------------------------------
 
 // wxPalette
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase

 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 
 {
     DECLARE_DYNAMIC_CLASS(wxPalette)
 


@@ -44,21 +44,16 @@ public:
     wxPalette& operator = (const wxPalette& palette);
     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;
     wxPalette& operator = (const wxPalette& palette);
     bool operator == (const wxPalette& palette) const;
     bool operator != (const wxPalette& palette) const;

-    bool Ok() 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;
     bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implementation
 
     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;
 
     // 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;
 };
 
     palette_t *GetMGLpalette_t() const;
 };
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-

 #endif // __WX_PALETTE_H__
 #endif // __WX_PALETTE_H__