Removing OS/2 specific positioning methods, no longer needed

[wxWidgets.git] / src / common / xpmdecod.cpp

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 6f593fc98923b4a45c587ac8de5eb425df41b438..68c99def3fa170cacd00ae3e59968fa61080a9cf 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -263,7 +263,7 @@ wxImage wxXPMDecoder::ReadFile(wxInputStream& stream)
 
 typedef struct
 {
-    char *name;
+    const char *name;
     wxUint32 rgb;
 } rgbRecord;
 
@@ -702,7 +702,7 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     {
         for (i_key = 0; i_key < chars_per_pixel; i_key++)
             key[i_key] = (wxChar)xpm_data[1 + i][i_key];
-        clr_def = ParseColor(xpm_data[1 + i]);
+        clr_def = ParseColor(xpm_data[1 + i] + chars_per_pixel);
         clr_data = new wxXPMColourMapData;
 
         if ( clr_def == NULL )