added wxWindow::Set/GetMin/MaxClientSize convenience functions

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index ef7f919bb89e59667c7a1de42858ddbe864b9079..2431cd3360500a99aca65cfc6eacd4d82e55386a 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -216,9 +216,7 @@ protected:
 
     bool CreateFromImage(const wxImage& image, int depth);
 
-   // ref counting code
-    virtual wxObjectRefData *CreateRefData() const;
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
 private:
     bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
@@ -344,7 +342,7 @@ public:
 private:
     inline virtual bool Load( wxGDIImage*     WXUNUSED(pImage)
                              ,const wxString& WXUNUSED(rName)
-                             ,HPS             WXUNUSED(hPs)
+                             ,WXHANDLE        WXUNUSED(hPs)
                              ,long            WXUNUSED(lFlags)
                              ,int             WXUNUSED(nDesiredWidth)
                              ,int             WXUNUSED(nDesiredHeight)