replace use of 'long/int bitmapType' with 'wxBitmapType bitmapType' in richtext and...

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

diff --git a/include/wx/mgl/palette.h b/include/wx/mgl/palette.h
index 436f02b208077170c2b5985a0a7c39b43cebb4fc..31fde89c0428f1d5c566891019f20c668753e8d7 100644 (file)
--- a/include/wx/mgl/palette.h
+++ b/include/wx/mgl/palette.h
@@ -20,24 +20,19 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 
 struct palette_t;
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxPalette: public wxPaletteBase
+class WXDLLIMPEXP_CORE 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();
-    bool operator == (const wxPalette& palette) const;
-    bool operator != (const wxPalette& palette) const;
-    virtual bool Ok() const;
+    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 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;


@@ -47,6 +42,8 @@ public:
     virtual int GetColoursCount() const;
 
     palette_t *GetMGLpalette_t() const;
     virtual int GetColoursCount() const;
 
     palette_t *GetMGLpalette_t() const;

+
+    DECLARE_DYNAMIC_CLASS(wxPalette)

 };
 
 #endif // __WX_PALETTE_H__
 };
 
 #endif // __WX_PALETTE_H__