X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62ad3cb358891240142cbf33259758bbe79be53f..af8481937288aa79f67b5e7df3caeef5a7824248:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 348574746c..36dda96e2a 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -130,11 +130,6 @@ public: virtual void SetPalette(const wxPalette& palette) = 0; #endif // wxUSE_PALETTE -#if WXWIN_COMPATIBILITY - wxPalette *GetColourMap() const { return GetPalette(); } - void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); }; -#endif // WXWIN_COMPATIBILITY - // copies the contents and mask of the given (colour) icon to the bitmap virtual bool CopyFromIcon(const wxIcon& icon) = 0; @@ -167,7 +162,7 @@ protected: #if defined(__WXMSW__) #include "wx/msw/bitmap.h" #elif defined(__WXMOTIF__) -#include "wx/motif/bitmap.h" +#include "wx/x11/bitmap.h" #elif defined(__WXGTK__) #include "wx/gtk/bitmap.h" #elif defined(__WXX11__)