rewritten to use wxTheMimeTypesManager

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

diff --git a/src/xpm/create.c b/src/xpm/create.c
index 71d33caadb44b875c5a9a62d2fc57f82c003dfd9..29fa8a508933d1bd9fed9c5f65fe5b85288381a6 100644 (file)
--- a/src/xpm/create.c
+++ b/src/xpm/create.c
@@ -222,17 +222,17 @@ SetCloseColor(Display *display, Colormap colormap, Visual *visual, XColor *col,
      * occurred, so we try the next closest color, and so on, until no more
      * colors are within closeness of the target. If we knew that the
      * colormap had changed, we could skip this sequence.
      * occurred, so we try the next closest color, and so on, until no more
      * colors are within closeness of the target. If we knew that the
      * colormap had changed, we could skip this sequence.

-     * 
+     *

      * If _none_ of the colors within closeness of the target can be allocated,
      * then we can finally be pretty sure that the colormap has actually
      * changed. In this case we try to allocate the original color (again),
      * then try the closecolor stuff (again)...
      * If _none_ of the colors within closeness of the target can be allocated,
      * then we can finally be pretty sure that the colormap has actually
      * changed. In this case we try to allocate the original color (again),
      * then try the closecolor stuff (again)...

-     * 
+     *

      * In theory it would be possible for an infinite loop to occur if another
      * process kept changing the colormap every time we sorted it, so we set
      * a maximum on the number of iterations. After this many tries, we use
      * XGrabServer() to ensure that the colormap remains unchanged.
      * In theory it would be possible for an infinite loop to occur if another
      * process kept changing the colormap every time we sorted it, so we set
      * a maximum on the number of iterations. After this many tries, we use
      * XGrabServer() to ensure that the colormap remains unchanged.

-     * 
+     *

      * This approach gives particularly bad worst case performance - as many as
      * <MaximumIterations> colormap reads and sorts may be needed, and as
      * many as <MaximumIterations> * <ColormapSize> attempted allocations
      * This approach gives particularly bad worst case performance - as many as
      * <MaximumIterations> colormap reads and sorts may be needed, and as
      * many as <MaximumIterations> * <ColormapSize> attempted allocations


@@ -668,10 +668,10 @@ XpmCreateImageFromXpmImage(Display *display, XpmImage *image,
 
        /*
         * set the ximage data
 
        /*
         * set the ximage data

-        * 
+        *

         * In case depth is 1 or bits_per_pixel is 4, 6, 8, 24 or 32 use
         * optimized functions, otherwise use slower but sure general one.
         * In case depth is 1 or bits_per_pixel is 4, 6, 8, 24 or 32 use
         * optimized functions, otherwise use slower but sure general one.

-        * 
+        *

         */
 
        if (ximage->depth == 1)
         */
 
        if (ximage->depth == 1)


@@ -1432,6 +1432,7 @@ XpmCreatePixmapFromXpmImage(Display *display, Drawable d, XpmImage *image,
 }
 
 #else  /* FOR_MSW part follows */
 }
 
 #else  /* FOR_MSW part follows */

+#if !defined(__VISAGECPP__)

 static void
 MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int height,
   unsigned int *pixelindex, Pixel *pixels)
 static void
 MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int height,
   unsigned int *pixelindex, Pixel *pixels)


@@ -1439,12 +1440,27 @@ MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int h
     unsigned int *data = pixelindex;
     unsigned int x, y;
 
     unsigned int *data = pixelindex;
     unsigned int x, y;
 

+    SelectObject(*dc, image->bitmap);
+    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,
+  unsigned int *pixelindex, Pixel *pixels)
+{
+    unsigned int *data = pixelindex;
+    unsigned int x, y;
+// TODO:
+/*

     SelectObject(*dc, image->bitmap);
        if (image->depth == 1)
        {
                for (y = 0; y < height; y++) {
                        for (x = 0; x < width; x++) {
     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] */
+                               SetPixel(*dc, x, y, (pixels[*(data++)] ? RGB(255,255,255) : 0));

                        }
                }
        }
                        }
                }
        }


@@ -1452,10 +1468,14 @@ MSWSetImagePixels(Display *dc, XImage *image, unsigned int width, unsigned int h
        {
                for (y = 0; y < height; y++) {
                        for (x = 0; x < width; x++) {
        {
                for (y = 0; y < height; y++) {
                        for (x = 0; x < width; x++) {

-                               SetPixel(*dc, x, y, pixels[*(data++)]); /* data is [x+y*width] */
+                               SetPixel(*dc, x, y, pixels[*(data++)]);

                        }
                }
        }
                        }
                }
        }

+*/
+ return;

 }
 }

+#endif // __VISAGECPP__
+

 
 #endif /* FOR_MSW */
 
 #endif /* FOR_MSW */