Fixed bug #1022383: 'several ComboBoxes appear selected'

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

diff --git a/include/wx/generic/paletteg.h b/include/wx/generic/paletteg.h
index 2aa5b4259ed24d105ff4cb1f646db94febcceaf9..54a6b51f73eefd35bd19c3ec853aba429936cd0c 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -5,7 +5,7 @@
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Created:     01/02/97
 // Id:
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -31,7 +31,7 @@ class wxPalette;
 // wxPalette
 //-----------------------------------------------------------------------------
 
 // wxPalette
 //-----------------------------------------------------------------------------
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 


@@ -44,7 +44,7 @@ class wxPalette: public wxGDIObject
     wxPalette& operator = ( const wxPalette& palette );
     bool operator == ( const wxPalette& palette );
     bool operator != ( const wxPalette& palette );
     wxPalette& operator = ( const wxPalette& palette );
     bool operator == ( const wxPalette& palette );
     bool operator != ( const wxPalette& palette );

-    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 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;


@@ -53,7 +53,4 @@ class wxPalette: public wxGDIObject
     // no data
 };
 
     // no data
 };
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-

 #endif // __WX_PALETTEG_H__
 #endif // __WX_PALETTEG_H__