added cw6 fixes and patrick's patches

[wxWidgets.git] / include / wx / os2 / bitmap.h

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index a9946995d91919966c1422b3c967277a9c7c2edb..fa4b750192edb3386de29b8dc68ade28c3e627fe 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -55,6 +55,7 @@ public:
 
     wxDC*                           m_pSelectedInto;
     HPS                             m_hPresentationSpace;
+    LONG                            m_lId;
 
     // optional mask for transparent drawing
     wxMask*                         m_pBitmapMask;
@@ -210,6 +211,10 @@ public:
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
+    inline LONG GetId() const
+      { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
+
+
 protected:
     // common part of all ctors
     void Init();
@@ -219,8 +224,6 @@ protected:
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
-    HDC                             m_hDc;
-    HPS                             m_hPs;
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
@@ -272,6 +275,9 @@ public:
 protected:
     WXHBITMAP                       m_hMaskBitmap;
     DECLARE_DYNAMIC_CLASS(wxMask)
+private:
+    HDC                             m_hDc;
+    HPS                             m_hPs;
 };
 
 // ----------------------------------------------------------------------------
@@ -305,6 +311,7 @@ public:
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
+                          ,HPS             hPs
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -324,6 +331,7 @@ public:
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight