fixed compilation if wxUSE_STL=1

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 91c1f52945f907df867a3898b1199edc112400fd..15be24fe3feb0b48982f5d3eaab9921ffc8e7156 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,3 +1,14 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/palette.h
+// Purpose:     Common header and base class for wxPalette
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+

 #ifndef _WX_PALETTE_H_BASE_
 #define _WX_PALETTE_H_BASE_
 
 #ifndef _WX_PALETTE_H_BASE_
 #define _WX_PALETTE_H_BASE_
 


@@ -8,17 +19,18 @@
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 

-// wxBrushBase
+// wxPaletteBase

 class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 {
 public:
     virtual ~wxPaletteBase() { }
 
 class WXDLLEXPORT wxPaletteBase: public wxGDIObject
 {
 public:
     virtual ~wxPaletteBase() { }
 

-    virtual bool Ok() const = 0;
-    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; };
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
+    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }

 };
 
 };
 

-#if defined(__PALMOS__)
+#if defined(__WXPALMOS__)

     #include "wx/palmos/palette.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/palette.h"
     #include "wx/palmos/palette.h"
 #elif defined(__WXMSW__)
     #include "wx/msw/palette.h"


@@ -36,11 +48,6 @@ public:
     #include "wx/os2/palette.h"
 #endif
 
     #include "wx/os2/palette.h"
 #endif
 

-#if WXWIN_COMPATIBILITY_2_4
-    #define wxColorMap wxPalette
-    #define wxColourMap wxPalette
-#endif
-

 #endif // wxUSE_PALETTE
 
 #endif
 #endif // wxUSE_PALETTE
 
 #endif