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

Visualge V3.0 fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-02-25 04:19:49 +00:00
parent 542875a8c4
commit 6dc3e5dc9c
2 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
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 /Q /N100 OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP30__ /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
@@ -111,6 +111,23 @@ LIBOBJECTS = \
wrffrdat.obj \ wrffrdat.obj \
wrffri.obj wrffri.obj
all: $(OBJECTS) $(OS2XPMLIB)
$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
touch $(WXDIR)\lib\os2xpm.lib
del $(WXDIR)\lib\os2xpm.lib
ilib $(OS2LIBFLAGS) $@ @<<
$**;
<<
del *.obj
clean:
del $(OS2XPMLIB)
erase /N $(OS2XPMDIR)\$D
rd $(OS2XPMDIR)\$D
cleanall: clean
$(LIBOBJECTS): $(LIBOBJECTS):
copy ..\xpm\$D\attrib.obj copy ..\xpm\$D\attrib.obj
copy ..\xpm\$D\crbuffri.obj copy ..\xpm\$D\crbuffri.obj
@@ -132,20 +149,3 @@ $(LIBOBJECTS):
copy ..\xpm\$D\wrffrdat.obj copy ..\xpm\$D\wrffrdat.obj
copy ..\xpm\$D\wrffri.obj copy ..\xpm\$D\wrffri.obj
all: $(OBJECTS) $(OS2XPMLIB)
$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
touch $(WXDIR)\lib\os2xpm.lib
del $(WXDIR)\lib\os2xpm.lib
ilib $(OS2LIBFLAGS) $@ @<<
$**;
<<
del *.obj
clean:
del $(OS2XPMLIB)
erase /N $(OS2XPMDIR)\$D
rd $(OS2XPMDIR)\$D
cleanall: clean

28
src/xpm/scan.c
View File

@@ -261,7 +261,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
/* /*
* scan shape mask if any * scan shape mask if any
*/ */
if (shapeimage) if (shapeimage)
{ {
#ifndef FOR_MSW #ifndef FOR_MSW
# ifndef AMIGA # ifndef AMIGA
@@ -293,7 +293,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
* *
*/ */
if (image) if (image)
{ {
#ifndef FOR_MSW #ifndef FOR_MSW
# ifndef AMIGA # ifndef AMIGA
@@ -301,7 +301,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
(image->byte_order == image->bitmap_bit_order)) (image->byte_order == image->bitmap_bit_order))
ErrorStatus = GetImagePixels1(image, width, height, &pmap, ErrorStatus = GetImagePixels1(image, width, height, &pmap,
storePixel); storePixel);
else if (image->format == ZPixmap) else if (image->format == ZPixmap)
{ {
if (image->bits_per_pixel == 8) if (image->bits_per_pixel == 8)
ErrorStatus = GetImagePixels8(image, width, height, &pmap); ErrorStatus = GetImagePixels8(image, width, height, &pmap);
@@ -309,7 +309,7 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
ErrorStatus = GetImagePixels16(image, width, height, &pmap); ErrorStatus = GetImagePixels16(image, width, height, &pmap);
else if (image->bits_per_pixel == 32) else if (image->bits_per_pixel == 32)
ErrorStatus = GetImagePixels32(image, width, height, &pmap); ErrorStatus = GetImagePixels32(image, width, height, &pmap);
} }
else else
ErrorStatus = GetImagePixels(image, width, height, &pmap); ErrorStatus = GetImagePixels(image, width, height, &pmap);
# else # else
@@ -317,11 +317,8 @@ XpmCreateXpmImageFromImage(display, image, shapeimage,
storePixel); storePixel);
# endif /* AMIGA */ # endif /* AMIGA */
#else
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 */
#endif #endif
@@ -989,9 +986,18 @@ AGetImagePixels (
#else /* ndef FOR_MSW */ #else /* ndef FOR_MSW */
#ifdef __OS2__ #ifdef __OS2__
/* Visual Age cannot deal with old, non-ansi, code */
static int #ifdef __VISAGECPP30__
MSWGetImagePixels( static int MSWGetImagePixels(
Display* display
, XImage* image
, unsigned int width
, unsigned int height
, PixelsMap* pmap
, int (*storeFunc) (Pixel, PixelsMap*, unsigned int*)
)
#else
static int MSWGetImagePixels(
Display* display Display* display
, XImage* image , XImage* image
, unsigned int width , unsigned int width
@@ -999,6 +1005,8 @@ MSWGetImagePixels(
, PixelsMap* pmap , PixelsMap* pmap
, int (*storeFunc) () , int (*storeFunc) ()
) )
#endif
#else #else
static int static int
MSWGetImagePixels(display, image, width, height, pmap, storeFunc) MSWGetImagePixels(display, image, width, height, pmap, storeFunc)