AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bitmap and Image updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 1999-12-15 16:59:08 +00:00
parent bed4d33171
commit 8ea3f821b7
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,6 +306,7 @@ public:
);
virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName
,HPS hPs
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
@ -325,6 +326,7 @@ public:
);
virtual bool Load( wxGDIImage* pImage
,const wxString& rName
,HPS hPs
,long lFlags
,int nDesiredWidth
,int nDesiredHeight

6
src/os2/bitmap.cpp
View File

@ -340,6 +340,8 @@ bool wxBitmap::LoadFile(
, long lType
)
{
HPS hPs;
UnRef();
wxBitmapHandler* pHandler = wxDynamicCast( FindHandler(lType)
@ -352,6 +354,7 @@ bool wxBitmap::LoadFile(
return(pHandler->LoadFile( this
,rFilename
,hPs
,lType
, -1
, -1
@ -739,6 +742,7 @@ bool wxBitmapHandler::Create(
bool wxBitmapHandler::Load(
wxGDIImage* pImage
, const wxString& rName
, HPS hPs
, long lFlags
, int nWidth
, int nHeight
@ -750,6 +754,7 @@ bool wxBitmapHandler::Load(
return(pBitmap ? LoadFile( pBitmap
,rName
,hPs
,lFlags
,nWidth
,nHeight
@ -787,6 +792,7 @@ bool wxBitmapHandler::Create(
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
, HPS WXUNUSED(hPs)
, long WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)

2
src/os2/icon.cpp
View File

@ -87,6 +87,7 @@ bool wxIcon::LoadFile(
)
{
wxGDIImageHandler* pHandler = FindHandler(lType);
HPS hPs = NULLHANDLE;
UnRef();
m_refData = new wxIconRefData;
@ -94,6 +95,7 @@ bool wxIcon::LoadFile(
if (pHandler)
return(pHandler->Load( this
,rFilename
,hPs
,lType
,nDesiredWidth
,nDesiredHeight