fix wxColourDialog::Centre() and SetSize() (modified patch 1831628)

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 4b35ed99c3b1651cb506284564491a6788270437..15be24fe3feb0b48982f5d3eaab9921ffc8e7156 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,16 +1,42 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 
-// include it to get wxUSE_PALETTE value
-#include "wx/setup.h"
+#include "wx/defs.h"
 
 #if wxUSE_PALETTE
 
-#if defined(__WXMSW__)
+#include "wx/object.h"
+#include "wx/gdiobj.h"
+
+// wxPaletteBase
+class WXDLLEXPORT wxPaletteBase: public wxGDIObject
+{
+public:
+    virtual ~wxPaletteBase() { }
+
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const = 0;
+    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
+};
+
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/palette.h"
+#elif defined(__WXMSW__)
     #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/palette.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)
     #include "wx/generic/paletteg.h"
 #elif defined(__WXX11__)
     #include "wx/x11/palette.h"