X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de6185e212ebc37ff11ff70278e3c4f68419b097..de3cfa6e8ca8957b737d027e00a7050dd5671262:/src/common/xpmdecod.cpp?ds=sidebyside diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp index 6a4f651fc0..709cc6e7dc 100644 --- a/src/common/xpmdecod.cpp +++ b/src/common/xpmdecod.cpp @@ -99,21 +99,20 @@ license is as follows: #if wxUSE_IMAGE && wxUSE_XPM +#include "wx/xpmdecod.h" + #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" #include "wx/utils.h" + #include "wx/hashmap.h" + #include "wx/stream.h" + #include "wx/image.h" #endif -#include "wx/stream.h" -#include "wx/image.h" -#include "wx/hashmap.h" #include - #include -#include "wx/xpmdecod.h" - #if wxUSE_STREAMS bool wxXPMDecoder::CanRead(wxInputStream& stream) { @@ -657,7 +656,7 @@ struct wxXPMColourMapData }; WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap); -wxImage wxXPMDecoder::ReadData(const char **xpm_data) +wxImage wxXPMDecoder::ReadData(const char* const* xpm_data) { wxCHECK_MSG(xpm_data, wxNullImage, wxT("NULL XPM data") );