Richtext interface fixes and additions for Phoenix

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 39f86eb11d4b936452eee1e3d67063de2b593afd..61013d53fb3c81daeb4261890fcca2714e02257f 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,30 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////
+// 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_
 

-// include it to get wxUSE_PALETTE value
-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_PALETTE
 
 
 #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__)
     #include "wx/msw/palette.h"
 #if defined(__WXMSW__)
     #include "wx/msw/palette.h"

-#elif defined(__WXMOTIF__)
-    #include "wx/motif/palette.h"
-#elif defined(__WXGTK__)
-    #include "wx/generic/paletteg.h"
-#elif defined(__WXX11__)
+#elif defined(__WXX11__) || defined(__WXMOTIF__)

     #include "wx/x11/palette.h"
     #include "wx/x11/palette.h"

-#elif defined(__WXMGL__)
-    #include "wx/mgl/palette.h"
+#elif defined(__WXGTK__) || defined(__WXCOCOA__)
+    #include "wx/generic/paletteg.h"

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/palette.h"
+    #include "wx/osx/palette.h"

 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/palette.h"

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

-#endif
-    // _WX_PALETTE_H_BASE_
+#endif // _WX_PALETTE_H_BASE_