Cleanly separate GUI socket-related code from net library.

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

diff --git a/include/wx/palette.h b/include/wx/palette.h
index ec364de2bb6ddf01fb55a4762c275e8b50795331..ba94985c3aad0ddc3cceafa9280adbc09fa6a4c2 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -19,40 +19,31 @@
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 
 #include "wx/object.h"
 #include "wx/gdiobj.h"
 

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

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

-    virtual bool Ok() const = 0;
-    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__)
     #include "wx/msw/palette.h"
 };
 
 #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(__WXX11__) || defined(__WXMOTIF__)
+    #include "wx/x11/palette.h"

 #elif defined(__WXGTK__) || defined(__WXCOCOA__)
     #include "wx/generic/paletteg.h"
 #elif defined(__WXGTK__) || defined(__WXCOCOA__)
     #include "wx/generic/paletteg.h"

-#elif defined(__WXX11__)
-    #include "wx/x11/palette.h"

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

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

 #endif // wxUSE_PALETTE
 
 #endif // wxUSE_PALETTE
 

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