X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6a193a08dc0d44190251a6986a179929a2a31a3..9398120d298d745763f253d87d774be3b134b43f:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index d05b3949db..478697ae6b 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -32,9 +32,10 @@ class WXDLLEXPORT wxImage; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxPalette; -#if !defined(__WXMSW__) - +#if defined(__WXMGL__) || defined(__WXMAC__) // Only used by some ports +// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes + // ---------------------------------------------------------------------------- // wxBitmapHandler: class which knows how to create/load/save bitmaps in // different formats @@ -158,10 +159,10 @@ protected: #include "wx/motif/bitmap.h" #elif defined(__WXGTK__) #include "wx/gtk/bitmap.h" +#elif defined(__WXX11__) +#include "wx/x11/bitmap.h" #elif defined(__WXMGL__) #include "wx/mgl/bitmap.h" -#elif defined(__WXQT__) -#include "wx/qt/bitmap.h" #elif defined(__WXMAC__) #include "wx/mac/bitmap.h" #elif defined(__WXPM__)