Bitmap and Image updates

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index fdd415cfbcac7070c662bb691a34b07674f6c257..6eccf80a0cd9f6108bb0949cacb4b8246b9452ad 100644 (file)
--- 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 64fe2519d0ab32681fc9f9534107d78fde023511..b93b3e23f564f8b61eeac2054017906ad2b782e2 100644 (file)
--- 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 d4ef849d8fd539749c15613bca27230ac1d71237..d3d3f49313996ca6a582ffc70e99f1d76268ef0d 100644 (file)
--- 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