Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile error fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2001-01-30 06:07:50 +00:00
parent 437a79a631
commit e464c180c4
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/os2/bitmap.cpp
View File

@@ -989,24 +989,24 @@ HBITMAP wxInvertMask(
,&vBmhdr ,&vBmhdr
); );
nWidth = (int)vBmhdr.cx; nWidth = (int)vBmhdr.cx;
nHeight = (int)vBmhdr.cyt; nHeight = (int)vBmhdr.cy;
} }
BITMAPINFOHEADER2 vBmih; BITMAPINFOHEADER2 vBmih;
SIZEL vSize = {0, 0}; SIZEL vSize = {0, 0};
DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L}; DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
HDC hDCSrc = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HDC hDCDst = ::DevOpenDC(ghAb, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE); HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPSSrc = ::GpiCreatePS(ghAb, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
HPS hPSDst = ::GpiCreatePS(ghAb, hDCDst, &vSize, PU_PELS | GPIA_ASSOC); HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(), POINTL vPoint[4] = { 0 ,0, nWidth, nHeight,
0, 0, rBitmap.GetWidth(), rBitmap.GetHeight() 0, 0, nWidth, nHeight
}; };
memset(&vBmih, NULLC, sizeof(BITMAPINFOHEADER2)); memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
vBmih.cbFix = sizeof(BITMAPINFOHEADER2); vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
vBmih.cx = lWidth; vBmih.cx = nWidth;
vBmih.cy = lHeight; vBmih.cy = nHeight;
vBmih.cPlanes = 1; vBmih.cPlanes = 1;
vBmih.cBitCount = 1; vBmih.cBitCount = 1;
@@ -1023,7 +1023,7 @@ HBITMAP wxInvertMask(
::GpiBitBlt( hPSDst ::GpiBitBlt( hPSDst
,hPSSrc ,hPSSrc
,4L ,4L
,&vPoint ,vPoint
,ROP_SRCCOPY ,ROP_SRCCOPY
,BBO_IGNORE ,BBO_IGNORE
); );
@@ -1031,7 +1031,7 @@ HBITMAP wxInvertMask(
::GpiDestroyPS(hPSSrc); ::GpiDestroyPS(hPSSrc);
::GpiDestroyPS(hPSDst); ::GpiDestroyPS(hPSDst);
::DevCloseDC(hDCSrc); ::DevCloseDC(hDCSrc);
::DevCloseDC(hDCDtl); ::DevCloseDC(hDCDst);
return hBmpInvMask; return hBmpInvMask;
} // end of WxWinGdi_InvertMask } // end of WxWinGdi_InvertMask

4
src/xpm/create.c
View File

@@ -865,7 +865,7 @@ XpmCreateImageFromXpmImage(display, image,
#endif #endif
{ {
#ifdef __OS2__ #ifdef __OS2__
HAB hab; HAB hab = WinQueryAnchorBlock(HWND_DESKTOP);
HPS hps; HPS hps;
SIZEL sizl = {0, 0}; SIZEL sizl = {0, 0};
#endif #endif
@@ -2578,7 +2578,7 @@ ParseAndPutPixels(
{ {
unsigned int a, x, y; unsigned int a, x, y;
#ifdef __OS2__ #ifdef __OS2__
HAB hab; HAB hab = WinQueryAnchorBlock(HWND_DESKTOP);
DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL}; DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL};
SIZEL sizl = {0, 0}; SIZEL sizl = {0, 0};
POINTL point; POINTL point;

21
src/xpm/scan.c
View File

@@ -96,16 +96,25 @@ LFUNC(AGetImagePixels, int, (XImage *image, unsigned int width,
int (*storeFunc) ())); int (*storeFunc) ()));
# endif/* AMIGA */ # endif/* AMIGA */
#else /* ndef FOR_MSW */ #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, unsigned int height, PixelsMap *pmap,
int (*storeFunc) ())); 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, Pixel *pixels, unsigned int mask,
unsigned int cpp, XpmAttributes *attributes)); 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; unsigned int x, y;
Pixel pixel; Pixel pixel;
#ifdef __OS2__ #ifdef __OS2__
HAB hab; HAB hab = WinQueryAnchorBlock(HWND_DESKTOP);
HDC shapedc; HDC shapedc;
DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL}; DEVOPENSTRUC dop = {NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL};
SIZEL sizl = {0, 0}; SIZEL sizl = {0, 0};

4
src/xpm/simx.c
View File

@@ -274,10 +274,8 @@ XCreateImage(Display *d, Visual *v,
{ {
XImage *img = (XImage *) XpmMalloc(sizeof(XImage)); XImage *img = (XImage *) XpmMalloc(sizeof(XImage));
#ifdef __OS2__ #ifdef __OS2__
HPS hps;
BITMAPINFOHEADER2 bmih; BITMAPINFOHEADER2 bmih;
hps = WinGetScreenPS(HWND_DESKTOP);
memset(&bmih, 0, sizeof(BITMAPINFOHEADER2)); memset(&bmih, 0, sizeof(BITMAPINFOHEADER2));
bmih.cbFix = sizeof(BITMAPINFOHEADER2); bmih.cbFix = sizeof(BITMAPINFOHEADER2);
bmih.cx = width; bmih.cx = width;
@@ -295,7 +293,7 @@ XCreateImage(Display *d, Visual *v,
img->bitmap = CreateCompatibleBitmap(*d, width, height); img->bitmap = CreateCompatibleBitmap(*d, width, height);
} else*/ { } else*/ {
#ifdef __OS2__ #ifdef __OS2__
img->bitmap = GpiCreateBitmap(hps, &bmih, 0L, NULL, NULL); img->bitmap = GpiCreateBitmap(*d, &bmih, 0L, NULL, NULL);
WinReleasePS(hps); WinReleasePS(hps);
#else #else
img->bitmap = CreateBitmap(width, height, 1 /* plane */ , img->bitmap = CreateBitmap(width, height, 1 /* plane */ ,