Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.

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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 0ffcd7a57acb511f306db93ddddf40e43bf2e297..35a9fa1fa389fa2c4d029ae23628cfb75f367f2c 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        palette.h
+// Name:        wx/generic/paletteg.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,10 +12,6 @@
 #ifndef __WX_PALETTEG_H__
 #define __WX_PALETTEG_H__
 
 #ifndef __WX_PALETTEG_H__
 #define __WX_PALETTEG_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "paletteg.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,13 +21,13 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxPalette;
+class WXDLLIMPEXP_CORE wxPalette;

 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 


@@ -39,21 +35,16 @@ class wxPalette: public wxGDIObject
 
     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );
 
     wxPalette();
     wxPalette( int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue );

-    wxPalette( const wxPalette& palette );

     ~wxPalette();
     ~wxPalette();

-    wxPalette& operator = ( const wxPalette& palette );
-    bool operator == ( const wxPalette& palette );
-    bool operator != ( const wxPalette& palette );
-    bool Ok() const;
+    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);
 
     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
 };
 
     bool GetRGB( int pixel, unsigned char *red, unsigned char *green, unsigned char *blue ) const;
 
     // no data
 };
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-

 #endif // __WX_PALETTEG_H__
 #endif // __WX_PALETTEG_H__