cleaning up image mess for os/2

[wxWidgets.git] / src / os2 / bitmap.cpp

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 47a6cdd53ca30c309c73cba243de85dfa593b9b9..b93b3e23f564f8b61eeac2054017906ad2b782e2 100644 (file)
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -34,12 +34,10 @@
 // macros
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-#endif
 
 // ============================================================================
 // implementation
@@ -187,9 +185,6 @@ wxBitmap::wxBitmap(
         wxLogLastError("GpiCreatePS Failure");
     }
 
-    m_hDc = hDc;
-    m_hPs = hPs;
-
     m_refData = pRefData;
 
     pRefData->m_nWidth = nTheWidth;
@@ -345,6 +340,8 @@ bool wxBitmap::LoadFile(
 , long                              lType
 )
 {
+    HPS                             hPs;
+
     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)
@@ -357,6 +354,7 @@ bool wxBitmap::LoadFile(
 
         return(pHandler->LoadFile( this
                                   ,rFilename
+                                  ,hPs
                                   ,lType
                                   , -1
                                   , -1
@@ -744,6 +742,7 @@ bool wxBitmapHandler::Create(
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , const wxString&                   rName
+, HPS                               hPs
 , long                              lFlags
 , int                               nWidth
 , int                               nHeight
@@ -755,6 +754,7 @@ bool wxBitmapHandler::Load(
 
     return(pBitmap ? LoadFile( pBitmap
                               ,rName
+                              ,hPs
                               ,lFlags
                               ,nWidth
                               ,nHeight
@@ -792,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)