Tidy up includes and #if wxUSE statements.

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 13c0c5dffcd6d64ea30dc96c64ac002833a2da23..b6b32df260cdc8bca0bcfb8ac79c38682d57d218 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -59,7 +59,8 @@ public:
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }
     virtual ~wxBitmap();
     bool operator == ( const wxBitmap& bmp ) const;
     bool operator != ( const wxBitmap& bmp ) const { return !(*this == bmp); }

-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     bool Create(int width, int height, int depth = -1);
 
 
     bool Create(int width, int height, int depth = -1);
 


@@ -116,6 +117,9 @@ public:
 protected:
     bool CreateFromImage(const wxImage& image, int depth);
 
 protected:
     bool CreateFromImage(const wxImage& image, int depth);
 

+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+

 private:
     // to be called from CreateFromImage only!
     bool CreateFromImageAsPixmap(const wxImage& image, int depth);
 private:
     // to be called from CreateFromImage only!
     bool CreateFromImageAsPixmap(const wxImage& image, int depth);