Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index e3fbd510690e39f438ce1e5a460b03536bc9d829..6eccf80a0cd9f6108bb0949cacb4b8246b9452ad 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -219,8 +219,6 @@ protected:
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
-    HDC                             m_hDc;
-    HPS                             m_hPs;
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
@@ -308,6 +306,7 @@ public:
                        );
     virtual bool LoadFile( wxBitmap*       pBitmap
                           ,const wxString& rName
+                          ,HPS             hPs
                           ,long            lFlags
                           ,int             nDesiredWidth
                           ,int             nDesiredHeight
@@ -327,6 +326,7 @@ public:
                        );
     virtual bool Load( wxGDIImage*     pImage
                       ,const wxString& rName
+                      ,HPS             hPs
                       ,long            lFlags
                       ,int             nDesiredWidth
                       ,int             nDesiredHeight