reverted Julian's r44600, it broke help window behavior so that it prevented apps...

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index a11f8bf9a53880244126fc7da8893412f7e9e046..72fb6178caa6376c2ffaffc96e46c4bba60eebae 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11
 // Purpose:
 // Author:      Vaclav Slavik
 // Created:     2001/03/11


@@ -8,14 +8,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_PALETTE_H__
 #define __WX_PALETTE_H__
 
 #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"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/gdiobj.h"


@@ -25,40 +20,30 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // 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);
 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();

 
     bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
 
     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
     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
+    DECLARE_DYNAMIC_CLASS(wxPalette)
+};

 
 #endif // __WX_PALETTE_H__
 
 #endif // __WX_PALETTE_H__