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

gdiimage updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-12-15 06:02:30 +00:00
parent 980662342f
commit 97507ccea7
12 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/bitmap.h
View File

@@ -219,8 +219,6 @@ protected:
private: private:
bool CopyFromIconOrCursor(const wxGDIImage& rIcon); bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
HDC m_hDc;
HPS m_hPs;
DECLARE_DYNAMIC_CLASS(wxBitmap) DECLARE_DYNAMIC_CLASS(wxBitmap)
}; };

1
include/wx/os2/gdiimage.h
View File

@@ -122,6 +122,7 @@ public:
) = 0; ) = 0;
virtual bool Load( wxGDIImage* pImage virtual bool Load( wxGDIImage* pImage
,const wxString& rName ,const wxString& rName
,HPS hPs
,long lFlags ,long lFlags
,int nDesiredWidth ,int nDesiredWidth
,int nDesiredHeight ,int nDesiredHeight

2
src/jpeg/MAKEFILE.VA
View File

@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = h:\dev\wx2\wxWindows WXDIR = j:\dev\wx2\wxWindows
OS2JPEGDIR=$(WXDIR)\src\jpeg OS2JPEGDIR=$(WXDIR)\src\jpeg
OS2JPEGINC=$(WINJPEGDIR) OS2JPEGINC=$(WINJPEGDIR)

2
src/makelib.vc
View File

@@ -10,7 +10,7 @@
# info # info
# Set WXDIR for your system # Set WXDIR for your system
WXDIR = $(WXWIN) WXDIR = j:\dev\wx2\wxWindows
!include $(WXDIR)\src\makevc.env !include $(WXDIR)\src\makevc.env

2
src/makeprog.vc
View File

@@ -11,7 +11,7 @@
# info # info
# Set WXDIR for your system # Set WXDIR for your system
WXDIR = $(WXWIN) WXDIR = j:\dev\wx2\wxWindows
WXUSINGDLL=0 WXUSINGDLL=0

13
src/makeva.env
View File

@@ -14,15 +14,16 @@ SRCSUFF=cpp
OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100 OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /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
# Change this to your WXWIN directory # Change this to your WXWIN directory
WXDIR=h:\dev\Wx2\wxwindows WXDIR=j:\dev\Wx2\wxwindows
WXSRC=$(WXDIR)\src\os2 WXSRC=$(WXDIR)\src\os2
WXINC=$(WXDIR)\include WXINC=$(WXDIR)\include
WXBASESRC=$(WXDIR)\src\common WXBASESRC=$(WXDIR)\src\common
EXTRAINC=$(WXDIR)\src\png EXTRAINC=$(WXDIR)\src\png
LINK=icc
RC=rc
##################################################################### #####################################################################
# These are the possible DLL/non-DLL usages: # These are the possible DLL/non-DLL usages:
@@ -108,7 +109,9 @@ D=$(D)DLL
INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC) INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\jpeg.lib LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB UPM32.LIB NETAPI32.LIB
EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib
LIBS=$(WXLIB) $(EXTRALIBS)
MAKEPRECOMP=/FiWX/WXPREC.H MAKEPRECOMP=/FiWX/WXPREC.H
OPTIONS= OPTIONS=
@@ -142,7 +145,7 @@ MAKEPRECOMP=/Fi$(PCH)
CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
# If you don't include wxprec.h, use CPPFLAGS2 # If you don't include wxprec.h, use CPPFLAGS2
CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS) LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
DUMMY=dummy DUMMY=dummy
!else !else
@@ -158,7 +161,7 @@ DUMMY=dummy
PRECOMP=/SiWX/WXPREC.H PRECOMP=/SiWX/WXPREC.H
CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS) CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)
CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS) CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS) LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
!endif !endif
DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj

2
src/makevc.env
View File

@@ -43,7 +43,7 @@ WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib sh
comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2
# Change this to your WXWIN directory # Change this to your WXWIN directory
WXDIR=$(WXWIN) WXDIR=j:\dev\wx2\wxWindows
WXSRC=$(WXDIR)\src\msw WXSRC=$(WXDIR)\src\msw
WXINC=$(WXDIR)\include WXINC=$(WXDIR)\include

3
src/os2/bitmap.cpp
View File

@@ -185,9 +185,6 @@ wxBitmap::wxBitmap(
wxLogLastError("GpiCreatePS Failure"); wxLogLastError("GpiCreatePS Failure");
} }
m_hDc = hDc;
m_hPs = hPs;
m_refData = pRefData; m_refData = pRefData;
pRefData->m_nWidth = nTheWidth; pRefData->m_nWidth = nTheWidth;

9
src/os2/makefile.va
View File

@@ -396,6 +396,7 @@ OS2OBJS = \
..\os2\$D\frame.obj \ ..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \ ..\os2\$D\gauge.obj \
..\os2\$D\gdiobj.obj \ ..\os2\$D\gdiobj.obj \
..\os2\$D\gdiimage.obj \
..\os2\$D\gsocket.obj \ ..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \ ..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \ ..\os2\$D\icon.obj \
@@ -470,6 +471,7 @@ OS2LIBOBJS1 = \
fontdlg.obj \ fontdlg.obj \
frame.obj \ frame.obj \
gauge.obj \ gauge.obj \
gdiimage.obj \
gdiobj.obj \ gdiobj.obj \
gsocket.obj \ gsocket.obj \
helpwin.obj \ helpwin.obj \
@@ -484,10 +486,10 @@ OS2LIBOBJS1 = \
metafile.obj \ metafile.obj \
minifram.obj \ minifram.obj \
msgdlg.obj \ msgdlg.obj \
nativdlg.obj \ nativdlg.obj
notebook.obj
OS2LIBOBJS2 = \ OS2LIBOBJS2 = \
notebook.obj \
ownerdrw.obj \ ownerdrw.obj \
palette.obj \ palette.obj \
pen.obj \ pen.obj \
@@ -752,6 +754,7 @@ $(OS2LIBOBJS1):
copy ..\os2\$D\fontdlg.obj copy ..\os2\$D\fontdlg.obj
copy ..\os2\$D\frame.obj copy ..\os2\$D\frame.obj
copy ..\os2\$D\gauge.obj copy ..\os2\$D\gauge.obj
copy ..\os2\$D\gdiimage.obj
copy ..\os2\$D\gdiobj.obj copy ..\os2\$D\gdiobj.obj
copy ..\os2\$D\gsocket.obj copy ..\os2\$D\gsocket.obj
copy ..\os2\$D\helpwin.obj copy ..\os2\$D\helpwin.obj
@@ -767,9 +770,9 @@ $(OS2LIBOBJS1):
copy ..\os2\$D\minifram.obj copy ..\os2\$D\minifram.obj
copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj copy ..\os2\$D\nativdlg.obj
copy ..\os2\$D\notebook.obj
$(OS2LIBOBJS2): $(OS2LIBOBJS2):
copy ..\os2\$D\notebook.obj
copy ..\os2\$D\ownerdrw.obj copy ..\os2\$D\ownerdrw.obj
copy ..\os2\$D\palette.obj copy ..\os2\$D\palette.obj
copy ..\os2\$D\pen.obj copy ..\os2\$D\pen.obj

2
src/png/MAKEFILE.VA
View File

@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = h:\dev\wx2\wxWindows WXDIR = j:\dev\wx2\wxWindows
OS2PNGDIR=$(WXDIR)\src\png OS2PNGDIR=$(WXDIR)\src\png
OS2PNGINC=$(WINPNGDIR) OS2PNGINC=$(WINPNGDIR)

2
src/xpm/MAKEFILE.VA
View File

@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = h:\dev\wx2\wxWindows WXDIR = j:\dev\wx2\wxWindows
OS2XPMDIR=$(WXDIR)\src\xpm OS2XPMDIR=$(WXDIR)\src\xpm
OS2XPMINC=$(WINXPMDIR) OS2XPMINC=$(WINXPMDIR)

2
src/zlib/MAKEFILE.VA
View File

@@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE
OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
# Change WXDIR or WXWIN to wherever wxWindows is found # Change WXDIR or WXWIN to wherever wxWindows is found
WXDIR = h:\dev\wx2\wxWindows WXDIR = j:\dev\wx2\wxWindows
OS2ZLIBDIR=$(WXDIR)\src\zlib OS2ZLIBDIR=$(WXDIR)\src\zlib
OS2ZLIBINC=$(WINPNGDIR) OS2ZLIBINC=$(WINPNGDIR)