use wxHashMap, not wxHashTable in wxXPMDecoder

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

diff --git a/src/xpm/simx.c b/src/xpm/simx.c
index 78bf77b0fcdfdbdaddc2708e4855d7e8f8e44d40..267c4195765dbb6aac8123a2791299ed697760ec 100644 (file)
--- a/src/xpm/simx.c
+++ b/src/xpm/simx.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 1989-94 GROUPE BULL
+ * Copyright (C) 1989-95 GROUPE BULL

  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to


@@ -33,11 +33,12 @@
 * Developed by HeDu 3/94 (hedu@cul-ipn.uni-kiel.de)                           *
 \*****************************************************************************/
 
 * Developed by HeDu 3/94 (hedu@cul-ipn.uni-kiel.de)                           *
 \*****************************************************************************/
 

-#include "xpm34.h"
+/* Moved here so that FOR_MSW gets defined if we are using wxWindows (GRG) */
+#include "xpm.h"

 
 #ifdef FOR_MSW
 
 
 #ifdef FOR_MSW
 

-#include "xpm34p.h"                    /* for XpmMalloc */
+#include "XpmI.h"           /* for XpmMalloc */

 
 /*
  * On DOS size_t is only 2 bytes, thus malloc(size_t s) can only malloc
 
 /*
  * On DOS size_t is only 2 bytes, thus malloc(size_t s) can only malloc


@@ -120,13 +121,27 @@ XDefaultScreen(Display *d)
 
 /* I get only 1 plane but 8 bits per pixel,
    so I think BITSPIXEL should be depth */
 
 /* I get only 1 plane but 8 bits per pixel,
    so I think BITSPIXEL should be depth */

-int 
+int

 XDefaultDepth(Display *display, Screen *screen)
 {
     int d, b;
 XDefaultDepth(Display *display, Screen *screen)
 {
     int d, b;

+#ifdef __OS2__
+    HPS                             hpsScreen;
+    HDC                             hdcScreen;
+    LONG                            lPlanes;
+    LONG                            lBitsPerPixel;
+    LONG                            nDepth;

 
 

+    hpsScreen = WinGetScreenPS(HWND_DESKTOP);
+    hdcScreen = GpiQueryDevice(hpsScreen);
+    DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes);
+    DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitsPerPixel);
+    b = (int)lBitsPerPixel;
+    WinReleasePS(hpsScreen);
+#else

     b = GetDeviceCaps(*display, BITSPIXEL);
     d = GetDeviceCaps(*display, PLANES);
     b = GetDeviceCaps(*display, BITSPIXEL);
     d = GetDeviceCaps(*display, PLANES);

+#endif

     return (b);
 }
 
     return (b);
 }
 


@@ -138,7 +153,7 @@ XDefaultColormap(Display *display, Screen *screen)
 
 /* convert hex color names,
    wrong digits (not a-f,A-F,0-9) are treated as zero */
 
 /* convert hex color names,
    wrong digits (not a-f,A-F,0-9) are treated as zero */

-static int 
+static int

 hexCharToInt(char c)
 {
     int r;
 hexCharToInt(char c)
 {
     int r;


@@ -155,7 +170,7 @@ hexCharToInt(char c)
     return (r);
 }
 
     return (r);
 }
 

-static int 
+static int

 rgbFromHex(char *hex, int *r, int *g, int *b)
 {
     int len;
 rgbFromHex(char *hex, int *r, int *g, int *b)
 {
     int len;


@@ -185,7 +200,7 @@ rgbFromHex(char *hex, int *r, int *g, int *b)
 }
 
 /* Color related functions */
 }
 
 /* Color related functions */

-int 
+int

 XParseColor(Display *d, Colormap *cmap, char *name, XColor *color)
 {
     int r, g, b;                       /* only 8 bit values used */
 XParseColor(Display *d, Colormap *cmap, char *name, XColor *color)
 {
     int r, g, b;                       /* only 8 bit values used */


@@ -203,7 +218,11 @@ XParseColor(Display *d, Colormap *cmap, char *name, XColor *color)
     }
 
     if (okay) {
     }
 
     if (okay) {

+#ifdef __OS2__
+       color->pixel = OS2RGB(r, g, b);
+#else

        color->pixel = RGB(r, g, b);
        color->pixel = RGB(r, g, b);

+#endif

        color->red = (BYTE) r;
        color->green = (BYTE) g;
        color->blue = (BYTE) b;
        color->red = (BYTE) r;
        color->green = (BYTE) g;
        color->blue = (BYTE) b;


@@ -213,14 +232,16 @@ XParseColor(Display *d, Colormap *cmap, char *name, XColor *color)
 }
 
 
 }
 
 

-int 
+/* GRG: 2nd arg is Colormap*, not Colormap */
+
+int

 XAllocColor(Display *d, Colormap *cmap, XColor *color)
 {
 /* colormap not used yet so color->pixel is the real COLORREF (RBG) and not an
    index in some colormap as in X */
     return (1);
 }
 XAllocColor(Display *d, Colormap *cmap, XColor *color)
 {
 /* colormap not used yet so color->pixel is the real COLORREF (RBG) and not an
    index in some colormap as in X */
     return (1);
 }

-void 
+void

 XQueryColors(Display *display, Colormap *colormap,
             XColor *xcolors, int ncolors)
 {
 XQueryColors(Display *display, Colormap *colormap,
             XColor *xcolors, int ncolors)
 {


@@ -236,7 +257,7 @@ XQueryColors(Display *display, Colormap *colormap,
     }
     return;
 }
     }
     return;
 }

-int 
+int

 XFreeColors(Display *d, Colormap cmap,
            unsigned long pixels[], int npixels, unsigned long planes)
 {
 XFreeColors(Display *d, Colormap cmap,
            unsigned long pixels[], int npixels, unsigned long planes)
 {


@@ -252,11 +273,33 @@ XCreateImage(Display *d, Visual *v,
             int pad, int foo)
 {
     XImage *img = (XImage *) XpmMalloc(sizeof(XImage));
             int pad, int foo)
 {
     XImage *img = (XImage *) XpmMalloc(sizeof(XImage));

+#ifdef __OS2__
+    BITMAPINFOHEADER2    bmih;
+
+    memset(&bmih, 0, sizeof(BITMAPINFOHEADER2));
+    bmih.cbFix = sizeof(BITMAPINFOHEADER2);
+    bmih.cx = width;
+    bmih.cy = height;
+    bmih.cPlanes = 1;
+    bmih.cBitCount = depth;
+#endif

 
     if (img) {
 
     if (img) {

-       /* *img = CreateCompatibleBitmap(*d, width, height); */
-       img->bitmap = CreateBitmap(width, height, 1 /* plane */ ,
-                                  depth /* bits per pixel */ , NULL);
+       /*JW: This is what it should be, but the picture comes out
+             just black!?  It appears to be doing monochrome reduction,
+             but I've got no clue why.  Using CreateBitmap() is supposed
+             to be slower, but otherwise ok
+         if ( depth == GetDeviceCaps(*d, BITSPIXEL) ) {
+           img->bitmap = CreateCompatibleBitmap(*d, width, height);
+        } else*/ {
+#ifdef __OS2__
+        img->bitmap = GpiCreateBitmap(*d, &bmih, 0L, NULL, NULL);
+        WinReleasePS(*d);
+#else
+           img->bitmap = CreateBitmap(width, height, 1 /* plane */ ,
+                                      depth /* bits per pixel */ , NULL);
+#endif
+       }

        img->width = width;
        img->height = height;
        img->depth = depth;
        img->width = width;
        img->height = height;
        img->depth = depth;


@@ -265,18 +308,22 @@ XCreateImage(Display *d, Visual *v,
 
 }
 
 
 }
 

-void 
+void

 XImageFree(XImage *img)
 {
     if (img) {
        XpmFree(img);
     }
 }
 XImageFree(XImage *img)
 {
     if (img) {
        XpmFree(img);
     }
 }

-void 
+void

 XDestroyImage(XImage *img)
 {
     if (img) {
 XDestroyImage(XImage *img)
 {
     if (img) {

+#ifdef __OS2__
+     GpiDeleteBitmap(img->bitmap);
+#else

        DeleteObject(img->bitmap);      /* check return ??? */
        DeleteObject(img->bitmap);      /* check return ??? */

+#endif

        XImageFree(img);
     }
 }
        XImageFree(img);
     }
 }