Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 04339568b5899e4509a43c27204fd003ca6a7258..85bf7dd689e9187be5e612c281ef767820814cfa 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,15 +1,44 @@
-#ifndef __PALETTEH_BASE__
-#define __PALETTEH_BASE__
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/palette.h
+// Purpose:     Common header and base class for wxPalette
+// Author:      Julian Smart
+// Modified by:
+// Created:
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows Licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PALETTE_H_BASE_
+#define _WX_PALETTE_H_BASE_
+
+#include "wx/defs.h"
+
+#if wxUSE_PALETTE
+
+#include "wx/object.h"
+#include "wx/gdiobj.h"
+
+// wxPaletteBase
+class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject
+{
+public:
+    virtual ~wxPaletteBase() { }
+
+    virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; }
+};

 
 #if defined(__WXMSW__)
 
 #if defined(__WXMSW__)

-#include "wx/msw/palette.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/palette.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/palette.h"
-#elif defined(__WXQT__)
-#include "wx/qt/palette.h"
+    #include "wx/msw/palette.h"
+#elif defined(__WXX11__) || defined(__WXMOTIF__)
+    #include "wx/x11/palette.h"
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)
+    #include "wx/generic/paletteg.h"
+#elif defined(__WXMAC__)
+    #include "wx/osx/palette.h"
+#elif defined(__WXPM__)
+    #include "wx/os2/palette.h"

 #endif
 
 #endif
 

-#endif
-    // __PALETTEH_BASE__
+#endif // wxUSE_PALETTE
+
+#endif // _WX_PALETTE_H_BASE_