From 8ea3f821b7efe6a1a0b9f5119274d4aac8d5f8cb Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Wed, 15 Dec 1999 16:59:08 +0000
Subject: [PATCH] Bitmap and Image updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/os2/bitmap.h | 2 ++
src/os2/bitmap.cpp | 6 ++++++
src/os2/icon.cpp | 2 ++
3 files changed, 10 insertions(+)
diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index fdd415cfbc..6eccf80a0c 100644
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -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
diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 64fe2519d0..b93b3e23f5 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -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)
diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index d4ef849d8f..d3d3f49313 100644
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -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
--
2.47.2