projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxTaskBarIcon compilation
[wxWidgets.git]
/
src
/
xpm
/
scan.c
diff --git
a/src/xpm/scan.c
b/src/xpm/scan.c
index 4390a0d6123dcbd2e6c2e3a72c92cbba09cf1aa3..f5e61bb78df26043c069793d643cf12a57ebad60 100644
(file)
--- a/
src/xpm/scan.c
+++ b/
src/xpm/scan.c
@@
-96,16
+96,25
@@
LFUNC(AGetImagePixels, int, (XImage *image, unsigned int width,
int (*storeFunc) ()));
# endif/* AMIGA */
#else /* ndef FOR_MSW */
int (*storeFunc) ()));
# endif/* AMIGA */
#else /* ndef FOR_MSW */
+
+#if defined(__OS2__) && defined(__VISAGECPP30__)
+LFUNC(MSWGetImagePixels, int, (Display* display, XImage* image, unsigned int width,
+ unsigned int height, PixelsMap* pmap,
+ int (*storeFunc) (Pixel, PixelsMap*, unsigned int*)));
+#else
LFUNC(MSWGetImagePixels, int, (Display *d, XImage *image, unsigned int width,
LFUNC(MSWGetImagePixels, int, (Display *d, XImage *image, unsigned int width,
-
unsigned int height, PixelsMap *pmap,
-
int (*storeFunc) ()));
+ unsigned int height, PixelsMap *pmap,
+ int (*storeFunc) ()));
#endif
#endif
+
+#endif
+
LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
-
XpmAttributes *attributes));
+ XpmAttributes *attributes));
LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-
Pixel *pixels, unsigned int mask,
-
unsigned int cpp, XpmAttributes *attributes));
+ Pixel *pixels, unsigned int mask,
+ unsigned int cpp, XpmAttributes *attributes));
/*
* This function stores the given pixel in the given arrays which are grown
/*
* This function stores the given pixel in the given arrays which are grown
@@
-1020,7
+1029,7
@@
MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
unsigned int x, y;
Pixel pixel;
#ifdef __OS2__
unsigned int x, y;
Pixel pixel;
#ifdef __OS2__
- HAB hab;
+ HAB hab
= WinQueryAnchorBlock(HWND_DESKTOP)
;
HDC shapedc;
DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL};
SIZEL sizl = {0, 0};
HDC shapedc;
DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL};
SIZEL sizl = {0, 0};