Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 99e6a5fb281d953202ee339ac798d9c8c2afdfd9..5f9e5b072a0fda15765cf50c3c881f274b0ead32 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagbmp.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -1023,7 +1019,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
         return false;
     }
 
-    int images = 1; // only generate one image
+    const int images = 1; // only generate one image
 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for
@@ -1051,7 +1047,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;
-    for (int i = 0; i < images; i++)
+    for (int img = 0; img < images; img++)
     {
         wxImage mask;
 
@@ -1084,10 +1080,10 @@ bool wxICOHandler::SaveFile(wxImage *image,
         {
             // just make a black mask all over:
             mask = image->Copy();
-            int k, j;
-            for (k = 0; k < mask.GetWidth(); k++)
+            int i, j;
+            for (i = 0; i < mask.GetWidth(); i++)
                 for (j = 0; j < mask.GetHeight(); j++)
-                    mask.SetRGB(k, j, 0, 0, 0 );
+                    mask.SetRGB(i, j, 0, 0, 0 );
         }
         // Set the formats for image and mask
         // (Windows never saves with more than 8 colors):