From 97507ccea7da6ca3765aa3c56bc74b1db47ca557 Mon Sep 17 00:00:00 2001 From: David Webster Date: Wed, 15 Dec 1999 06:02:30 +0000 Subject: [PATCH 1/1] gdiimage updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/os2/bitmap.h | 2 -- include/wx/os2/gdiimage.h | 1 + src/jpeg/MAKEFILE.VA | 2 +- src/makelib.vc | 2 +- src/makeprog.vc | 2 +- src/makeva.env | 13 ++++++++----- src/makevc.env | 2 +- src/os2/bitmap.cpp | 3 --- src/os2/makefile.va | 9 ++++++--- src/png/MAKEFILE.VA | 2 +- src/xpm/MAKEFILE.VA | 2 +- src/zlib/MAKEFILE.VA | 2 +- 12 files changed, 22 insertions(+), 20 deletions(-) diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index e3fbd51069..fdd415cfbc 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -219,8 +219,6 @@ protected: private: bool CopyFromIconOrCursor(const wxGDIImage& rIcon); - HDC m_hDc; - HPS m_hPs; DECLARE_DYNAMIC_CLASS(wxBitmap) }; diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 9ad840e345..db980074f7 100644 --- a/include/wx/os2/gdiimage.h +++ b/include/wx/os2/gdiimage.h @@ -122,6 +122,7 @@ public: ) = 0; virtual bool Load( wxGDIImage* pImage ,const wxString& rName + ,HPS hPs ,long lFlags ,int nDesiredWidth ,int nDesiredHeight diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA index 50c8d57b87..b4926a384f 100644 --- a/src/jpeg/MAKEFILE.VA +++ b/src/jpeg/MAKEFILE.VA @@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2JPEGDIR=$(WXDIR)\src\jpeg OS2JPEGINC=$(WINJPEGDIR) diff --git a/src/makelib.vc b/src/makelib.vc index b6a664d4da..6cbf046e07 100644 --- a/src/makelib.vc +++ b/src/makelib.vc @@ -10,7 +10,7 @@ # info # Set WXDIR for your system -WXDIR = $(WXWIN) +WXDIR = j:\dev\wx2\wxWindows !include $(WXDIR)\src\makevc.env diff --git a/src/makeprog.vc b/src/makeprog.vc index b89d4066d8..5cf84b6a95 100644 --- a/src/makeprog.vc +++ b/src/makeprog.vc @@ -11,7 +11,7 @@ # info # Set WXDIR for your system -WXDIR = $(WXWIN) +WXDIR = j:\dev\wx2\wxWindows WXUSINGDLL=0 diff --git a/src/makeva.env b/src/makeva.env index ce9f1fde34..481f40869b 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -14,15 +14,16 @@ SRCSUFF=cpp OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16 OS2LIBFLAGS=/NOL /NOE -OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change this to your WXWIN directory -WXDIR=h:\dev\Wx2\wxwindows +WXDIR=j:\dev\Wx2\wxwindows WXSRC=$(WXDIR)\src\os2 WXINC=$(WXDIR)\include WXBASESRC=$(WXDIR)\src\common EXTRAINC=$(WXDIR)\src\png +LINK=icc +RC=rc ##################################################################### # 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) -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 OPTIONS= @@ -142,7 +145,7 @@ MAKEPRECOMP=/Fi$(PCH) CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) # If you don't include wxprec.h, use CPPFLAGS2 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 !else @@ -158,7 +161,7 @@ DUMMY=dummy PRECOMP=/SiWX/WXPREC.H CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(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 DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj diff --git a/src/makevc.env b/src/makevc.env index 88fd65a004..68e7bf0b16 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -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 # Change this to your WXWIN directory -WXDIR=$(WXWIN) +WXDIR=j:\dev\wx2\wxWindows WXSRC=$(WXDIR)\src\msw WXINC=$(WXDIR)\include diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp index 8c03d33f86..64fe2519d0 100644 --- a/src/os2/bitmap.cpp +++ b/src/os2/bitmap.cpp @@ -185,9 +185,6 @@ wxBitmap::wxBitmap( wxLogLastError("GpiCreatePS Failure"); } - m_hDc = hDc; - m_hPs = hPs; - m_refData = pRefData; pRefData->m_nWidth = nTheWidth; diff --git a/src/os2/makefile.va b/src/os2/makefile.va index 78d12ab328..0332017631 100644 --- a/src/os2/makefile.va +++ b/src/os2/makefile.va @@ -396,6 +396,7 @@ OS2OBJS = \ ..\os2\$D\frame.obj \ ..\os2\$D\gauge.obj \ ..\os2\$D\gdiobj.obj \ + ..\os2\$D\gdiimage.obj \ ..\os2\$D\gsocket.obj \ ..\os2\$D\helpwin.obj \ ..\os2\$D\icon.obj \ @@ -470,6 +471,7 @@ OS2LIBOBJS1 = \ fontdlg.obj \ frame.obj \ gauge.obj \ + gdiimage.obj \ gdiobj.obj \ gsocket.obj \ helpwin.obj \ @@ -484,10 +486,10 @@ OS2LIBOBJS1 = \ metafile.obj \ minifram.obj \ msgdlg.obj \ - nativdlg.obj \ - notebook.obj + nativdlg.obj OS2LIBOBJS2 = \ + notebook.obj \ ownerdrw.obj \ palette.obj \ pen.obj \ @@ -752,6 +754,7 @@ $(OS2LIBOBJS1): copy ..\os2\$D\fontdlg.obj copy ..\os2\$D\frame.obj copy ..\os2\$D\gauge.obj + copy ..\os2\$D\gdiimage.obj copy ..\os2\$D\gdiobj.obj copy ..\os2\$D\gsocket.obj copy ..\os2\$D\helpwin.obj @@ -767,9 +770,9 @@ $(OS2LIBOBJS1): copy ..\os2\$D\minifram.obj copy ..\os2\$D\msgdlg.obj copy ..\os2\$D\nativdlg.obj - copy ..\os2\$D\notebook.obj $(OS2LIBOBJS2): + copy ..\os2\$D\notebook.obj copy ..\os2\$D\ownerdrw.obj copy ..\os2\$D\palette.obj copy ..\os2\$D\pen.obj diff --git a/src/png/MAKEFILE.VA b/src/png/MAKEFILE.VA index 23909907dd..ca5e78db75 100644 --- a/src/png/MAKEFILE.VA +++ b/src/png/MAKEFILE.VA @@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2PNGDIR=$(WXDIR)\src\png OS2PNGINC=$(WINPNGDIR) diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA index b6282a002a..f3466868c2 100644 --- a/src/xpm/MAKEFILE.VA +++ b/src/xpm/MAKEFILE.VA @@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2XPMDIR=$(WXDIR)\src\xpm OS2XPMINC=$(WINXPMDIR) diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA index 165b8e9ece..3e4fcdf3eb 100644 --- a/src/zlib/MAKEFILE.VA +++ b/src/zlib/MAKEFILE.VA @@ -19,7 +19,7 @@ OS2LIBFLAGS=/NOL /NOE OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB # Change WXDIR or WXWIN to wherever wxWindows is found -WXDIR = h:\dev\wx2\wxWindows +WXDIR = j:\dev\wx2\wxWindows OS2ZLIBDIR=$(WXDIR)\src\zlib OS2ZLIBINC=$(WINPNGDIR) -- 2.45.2