]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/gtk/bitmap.h
fixed wxGTK1 compilation after wxDC changes (still doesn't work)
[wxWidgets.git] / include / wx / gtk / bitmap.h
index 98bc4a8beea942192afda6193e56a176f3049182..5cc7ed1c1c6aba9546a4ffb12a8e7ca014b2f635 100644 (file)
@@ -66,14 +66,12 @@ public:
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
 #endif // wxUSE_IMAGE
     virtual ~wxBitmap();
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
 
     bool Create(int width, int height, int depth = -1);
 
-    int GetHeight() const;
-    int GetWidth() const;
-    int GetDepth() const;
+    virtual int GetHeight() const;
+    virtual int GetWidth() const;
+    virtual int GetDepth() const;
 
 #if wxUSE_IMAGE
     wxImage ConvertToImage() const;
@@ -127,8 +125,8 @@ protected:
     bool CreateFromImage(const wxImage& image, int depth);
 #endif // wxUSE_IMAGE
 
-    virtual wxObjectRefData* CreateRefData() const;
-    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+    virtual wxGDIRefData* CreateGDIRefData() const;
+    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
 
 private:
 #if wxUSE_IMAGE