2 warnings from Solaris build log fixed

[wxWidgets.git] / src / xpm / create.c

diff --git a/src/xpm/create.c b/src/xpm/create.c
index 1b1e59218246199dcc80e946b69b2a942165c1c6..29fa8a508933d1bd9fed9c5f65fe5b85288381a6 100644 (file)
--- a/src/xpm/create.c
+++ b/src/xpm/create.c
@@ -1441,22 +1441,11 @@ MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int h
     unsigned int x, y;
 
     SelectObject(*dc, image->bitmap);
-       if (image->depth == 1)
-       {
-               for (y = 0; y < height; y++) {
-                       for (x = 0; x < width; x++) {
-                               SetPixel(*dc, x, y, (pixels[*(data++)] ? RGB(255,255,255) : 0)); /* data is [x+y*width] */
-                       }
-               }
-       }
-       else
-       {
-               for (y = 0; y < height; y++) {
-                       for (x = 0; x < width; x++) {
-                               SetPixel(*dc, x, y, pixels[*(data++)]); /* data is [x+y*width] */
-                       }
-               }
-       }
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            SetPixel(*dc, x, y, pixels[*(data++)]); /* data is [x+y*width] */
+        }
+    }
 }
 #else
 void MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int height,