gdiimage updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index e3fbd510690e39f438ce1e5a460b03536bc9d829..fdd415cfbcac7070c662bb691a34b07674f6c257 100644 (file)
--- 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 9ad840e3459806501b84dcafef5383eceb5cb9f8..db980074f79f51479365b7e9127ec11f0099a93e 100644 (file)
--- 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 50c8d57b87e2e530520cbcf972cf8c845b14385a..b4926a384fcec9c26354671e0d50d3896c5b15d4 100644 (file)
--- 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 b6a664d4dadc362a22c6f2ce0522c724f57bdb18..6cbf046e070e29a1df2f9ea82b2f4bf6d114c354 100644 (file)
--- 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 b89d4066d810d8aef14d7520908c2f38819cfe1e..5cf84b6a95d6df4a6fb1d3f1f9b32bffffa6ce0e 100644 (file)
--- 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 ce9f1fde34b7f0875c8b1e9e4ffb5b9968fa4b60..481f40869bd8b87818b6be6224b4de83e9cb0632 100644 (file)
--- 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 88fd65a0048996ea770511d2ff076c706f93c707..68e7bf0b16509de17266cfcc0ce7d90d9dcc4c02 100644 (file)
--- 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 8c03d33f86a37d90329f3f2e6fe8b64c7136e76e..64fe2519d0ab32681fc9f9534107d78fde023511 100644 (file)
--- 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 78d12ab328852c0b49bf77c0ebc567838c86175f..0332017631b70cf7b8952115680c156324fd835a 100644 (file)
--- 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 23909907dd381925c7a5b78e1738ff51fea84376..ca5e78db751cfb51babe1910e5790594854d4a1c 100644 (file)
--- 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 b6282a002abae05e143b249e3a0a1363352f7dae..f3466868c201b86f8b7de1b6a6d95fac991cd760 100644 (file)
--- 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 165b8e9eceea732ef97e0b136494e25bdbc70a90..3e4fcdf3eb608c230a851e3c0a9c0c25a8755e11 100644 (file)
--- 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)