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 b3e3fb136942843fc8718b1030f034ccf0c410d2..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


@@ -124,8 +125,20 @@ 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;

 
 

-#if !defined(__VISAGECPP__) /* fisme for OS/2 */
+    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);
 #endif
     b = GetDeviceCaps(*display, BITSPIXEL);
     d = GetDeviceCaps(*display, PLANES);
 #endif


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

-#if !defined(__VISAGECPP__) /* fixme for OS/2 */
+#ifdef __OS2__
+       color->pixel = OS2RGB(r, g, b);
+#else

        color->pixel = RGB(r, g, b);
 #endif
        color->red = (BYTE) r;
        color->pixel = RGB(r, g, b);
 #endif
        color->red = (BYTE) r;


@@ -217,6 +232,8 @@ XParseColor(Display *d, Colormap *cmap, char *name, XColor *color)
 }
 
 
 }
 
 

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

 int
 XAllocColor(Display *d, Colormap *cmap, XColor *color)
 {
 int
 XAllocColor(Display *d, Colormap *cmap, XColor *color)
 {


@@ -233,13 +250,11 @@ XQueryColors(Display *display, Colormap *colormap,
     XColor *xc = xcolors;
     int i;
 
     XColor *xc = xcolors;
     int i;
 

-#if !defined(__VISAGECPP__) /* fixme for OS/2 */

     for (i = 0; i < ncolors; i++, xc++) {
        xc->red = GetRValue(xc->pixel);
        xc->green = GetGValue(xc->pixel);
        xc->blue = GetBValue(xc->pixel);
     }
     for (i = 0; i < ncolors; i++, xc++) {
        xc->red = GetRValue(xc->pixel);
        xc->green = GetGValue(xc->pixel);
        xc->blue = GetBValue(xc->pixel);
     }

-#endif

     return;
 }
 int
     return;
 }
 int


@@ -258,13 +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); */
-#if !defined(__VISAGECPP__) /* fixme for OS/2 */
-       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
 #endif

+       }

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


@@ -284,7 +319,9 @@ void
 XDestroyImage(XImage *img)
 {
     if (img) {
 XDestroyImage(XImage *img)
 {
     if (img) {

-#if !defined(__VISAGECPP__) /* fixme for OS/2 */
+#ifdef __OS2__
+     GpiDeleteBitmap(img->bitmap);
+#else

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