X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/530ecef01f7e33c2ec1b8b1ad8025484709bef1d..be4da8f0315e36de2322cd312c7184f55c0333f5:/src/common/xpmdecod.cpp?ds=sidebyside

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index ac1b1b7249..709cc6e7dc 100644
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -99,23 +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"
-    #if wxUSE_STREAMS
-        #include "wx/stream.h"
-    #endif
+    #include "wx/hashmap.h"
+    #include "wx/stream.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/image.h"
-#include "wx/hashmap.h"
 #include <string.h>
-
 #include <ctype.h>
 
-#include "wx/xpmdecod.h"
-
 #if wxUSE_STREAMS
 bool wxXPMDecoder::CanRead(wxInputStream& stream)
 {
@@ -659,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") );