X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..6342bd1ab36c1957684c00d408d09fba65d33db6:/src/os2/bitmap.cpp

diff --git a/src/os2/bitmap.cpp b/src/os2/bitmap.cpp
index 8c03d33f86..2d7a3fc799 100644
--- a/src/os2/bitmap.cpp
+++ b/src/os2/bitmap.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+    #pragma implementation "bitmap.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -127,10 +131,6 @@ bool wxBitmap::CopyFromIcon(
     if (!rIcon.Ok())
         return(FALSE);
 
-#if WXWIN_COMPATIBILITY_2
-    refData->m_ok = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
-
     return CopyFromIconOrCursor(rIcon);
 }
 
@@ -185,9 +185,6 @@ wxBitmap::wxBitmap(
         wxLogLastError("GpiCreatePS Failure");
     }
 
-    m_hDc = hDc;
-    m_hPs = hPs;
-
     m_refData = pRefData;
 
     pRefData->m_nWidth = nTheWidth;
@@ -343,6 +340,8 @@ bool wxBitmap::LoadFile(
 , long                              lType
 )
 {
+    HPS                             hPs = NULLHANDLE;
+
     UnRef();
 
     wxBitmapHandler*                pHandler = wxDynamicCast( FindHandler(lType)
@@ -355,6 +354,7 @@ bool wxBitmap::LoadFile(
 
         return(pHandler->LoadFile( this
                                   ,rFilename
+                                  ,hPs
                                   ,lType
                                   , -1
                                   , -1
@@ -742,6 +742,7 @@ bool wxBitmapHandler::Create(
 bool wxBitmapHandler::Load(
   wxGDIImage*                       pImage
 , const wxString&                   rName
+, HPS                               hPs
 , long                              lFlags
 , int                               nWidth
 , int                               nHeight
@@ -753,6 +754,7 @@ bool wxBitmapHandler::Load(
 
     return(pBitmap ? LoadFile( pBitmap
                               ,rName
+                              ,hPs
                               ,lFlags
                               ,nWidth
                               ,nHeight
@@ -790,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)