Add possibility to hide and show again wxRibbonBar pages.

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 491838d3cddc8d377955a31518271073ae46c250..61013d53fb3c81daeb4261890fcca2714e02257f 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -20,26 +20,22 @@
 #include "wx/gdiobj.h"
 
 // wxPaletteBase
 #include "wx/gdiobj.h"
 
 // wxPaletteBase

-class WXDLLEXPORT wxPaletteBase: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject

 {
 public:
     virtual ~wxPaletteBase() { }
 
 {
 public:
     virtual ~wxPaletteBase() { }
 

-    virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; }
+    virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; }

 };
 
 };
 

-#if defined(__WXPALMOS__)
-    #include "wx/palmos/palette.h"
-#elif defined(__WXMSW__)
+#if defined(__WXMSW__)

     #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"
     #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(__WXMGL__)
-    #include "wx/mgl/palette.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"
 #endif
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #endif