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 9e63395c3de9e6bf32dbfa45bf43568542c9428f..54a6b51f73eefd35bd19c3ec853aba429936cd0c 100644 (file)
--- a/include/wx/generic/paletteg.h
+++ b/include/wx/generic/paletteg.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -12,7 +12,7 @@
 #ifndef __WX_PALETTEG_H__
 #define __WX_PALETTEG_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "paletteg.h"
 #endif
 
@@ -31,7 +31,7 @@ class wxPalette;
 // wxPalette
 //-----------------------------------------------------------------------------
 
-class wxPalette: public wxGDIObject
+class wxPalette: public wxPaletteBase
 {
   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 );
-    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;
@@ -53,7 +53,4 @@ class wxPalette: public wxGDIObject
     // no data
 };
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-
 #endif // __WX_PALETTEG_H__