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

A few more minor fixes for OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-02-15 19:44:04 +00:00
parent a784652571
commit 71b59b447f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xpm/MAKEFILE.VA
View File

@@ -13,7 +13,7 @@
OBJSUFF=obj OBJSUFF=obj
SRCSUFF=cpp SRCSUFF=cpp
OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Ss /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Q /N100
OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
OS2LIBFLAGS=/NOL /NOE OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
@@ -132,7 +132,7 @@ $(LIBOBJECTS):
copy ..\xpm\$D\wrffrdat.obj copy ..\xpm\$D\wrffrdat.obj
copy ..\xpm\$D\wrffri.obj copy ..\xpm\$D\wrffri.obj
all: $(OS2XPMLIB) all: $(OBJECTS) $(OS2XPMLIB)
$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS) $(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
touch $(WXDIR)\lib\os2xpm.lib touch $(WXDIR)\lib\os2xpm.lib

5
src/xpm/scan.c
View File

@@ -319,11 +319,9 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
#else #else
#ifndef __OS2__
ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap, ErrorStatus = MSWGetImagePixels(display, image, width, height, &pmap,
storePixel); storePixel);
/* calling convention all messed up OS/2 -- figure out later */ /* calling convention all messed up OS/2 -- figure out later */
#endif
#endif #endif
@@ -1042,11 +1040,8 @@ MSWGetImagePixels(display, image, width, height, pmap, storeFunc)
pixel = GetPixel(*display, x, y); pixel = GetPixel(*display, x, y);
#endif #endif
#ifndef __OS2__
/* calling convention all messed up under OS/2 */
if ((*storeFunc) (pixel, pmap, iptr)) if ((*storeFunc) (pixel, pmap, iptr))
return (XpmNoMemory); return (XpmNoMemory);
#endif
} }
} }
return (XpmSuccess); return (XpmSuccess);

4
src/xpm/simx.h
View File

@@ -47,7 +47,9 @@
#include<os2.h> #include<os2.h>
typedef unsigned long COLORREF; typedef unsigned long COLORREF;
// RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def
#define OS2RGB(r,g,b) ((ULONG ((BYTE) (r) | ((UINT) (g) << 8)) | (((ULONG)(BYTE)(b)) << 16))) //#define OS2RGB(r,g,b) ((ULONG ((BYTE) (r) | ((UINT) (g) << 8)) | (((ULONG)(BYTE)(b)) << 16)))
#define OS2RGB(r,g,b) ((unsigned long)r<<16|(unsigned long)g<<8|(unsigned long)b)
#define GetBValue(rgb) ((BYTE)((rgb) >> 16)) #define GetBValue(rgb) ((BYTE)((rgb) >> 16))
#define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8)) #define GetGValue(rgb) ((BYTE)(((WORD)(rgb)) >> 8))
#define GetRValue(rgb) ((BYTE)(rgb)) #define GetRValue(rgb) ((BYTE)(rgb))