fixed Fit() to call SetClientSize() and not SetSize()

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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index 69a91e7c600c7ea3d6ac9c890c34875e085ed79d..fa4767ac83793975e419cb1a0a99620ee0b41b54 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/src/common/xpmdecod.cpp
@@ -90,10 +90,6 @@ license is as follows:
  * in this Software without prior written authorization from GROUPE BULL.
  */
 
  * in this Software without prior written authorization from GROUPE BULL.
  */
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "xpmdecod.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -127,7 +123,7 @@ bool wxXPMDecoder::CanRead(wxInputStream& stream)
     if ( !stream.Read(buf, WXSIZEOF(buf)) )
         return false;
 
     if ( !stream.Read(buf, WXSIZEOF(buf)) )
         return false;
 

-    stream.SeekI(-(off_t)WXSIZEOF(buf), wxFromCurrent);
+    stream.SeekI(-(wxFileOffset)WXSIZEOF(buf), wxFromCurrent);

 
     return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
 }
 
     return memcmp(buf, "/* XPM */", WXSIZEOF(buf)) == 0;
 }


@@ -668,7 +664,6 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
     wxChar key[64];
     const char *clr_def;
     bool hasMask;
     wxChar key[64];
     const char *clr_def;
     bool hasMask;

-    wxXPMColourMapData clr_data;

     wxXPMColourMap clr_tbl;
     wxXPMColourMap::iterator it;
     wxString maskKey;
     wxXPMColourMap clr_tbl;
     wxXPMColourMap::iterator it;
     wxString maskKey;


@@ -702,6 +697,8 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
      */
     for (i = 0; i < colors_cnt; i++)
     {
      */
     for (i = 0; i < colors_cnt; i++)
     {

+        wxXPMColourMapData clr_data = {255,0,255};
+

         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] + chars_per_pixel);
         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] + chars_per_pixel);


@@ -710,17 +707,15 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
         {
             wxLogError(_("XPM: malformed colour definition '%s'!"),
                        xpm_data[1+i]);
         {
             wxLogError(_("XPM: malformed colour definition '%s'!"),
                        xpm_data[1+i]);

-            clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

         }
         else
         {
         }
         else
         {

-            bool isNone;
+            bool isNone = false;

             if ( !GetRGBFromName(clr_def, &isNone,
                                  &clr_data.R, &clr_data.G, &clr_data.B) )
             {
                 wxLogError(_("XPM: malformed colour definition '%s'!"),
                            xpm_data[1+i]);
             if ( !GetRGBFromName(clr_def, &isNone,
                                  &clr_data.R, &clr_data.G, &clr_data.B) )
             {
                 wxLogError(_("XPM: malformed colour definition '%s'!"),
                            xpm_data[1+i]);

-                clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

             }
             else
             {
             }
             else
             {


@@ -729,7 +724,6 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
                     img.SetMask(true);
                     img.SetMaskColour(255, 0, 255);
                     hasMask = true;
                     img.SetMask(true);
                     img.SetMaskColour(255, 0, 255);
                     hasMask = true;

-                    clr_data.R = 255, clr_data.G = 0, clr_data.B = 255;

                     maskKey = key;
                 }
             }
                     maskKey = key;
                 }
             }


@@ -744,7 +738,7 @@ wxImage wxXPMDecoder::ReadData(const char **xpm_data)
      */
     if (hasMask)
     {
      */
     if (hasMask)
     {

-        for (it = clr_tbl.begin(); it != clr_tbl.end(); it++)
+        for (it = clr_tbl.begin(); it != clr_tbl.end(); ++it)

         {
             if (it->second.R == 255 && it->second.G == 0 &&
                 it->second.B == 255 &&
         {
             if (it->second.R == 255 && it->second.G == 0 &&
                 it->second.B == 255 &&