added template wxScopedArray<> too

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index b78cc41a36076c74b4dbf6cb5496e14fe6a7b4c3..22debebe20c75b86f18621854651aaef077bf742 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -161,6 +161,9 @@ public:
     virtual int GetWidth() const = 0;
     virtual int GetDepth() const = 0;
 
+    wxSize GetSize() const
+        { return wxSize(GetWidth(), GetHeight()); }
+
 #if wxUSE_IMAGE
     virtual wxImage ConvertToImage() const = 0;
 #endif // wxUSE_IMAGE
@@ -171,7 +174,7 @@ public:
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const = 0;
 
     virtual bool SaveFile(const wxString &name, wxBitmapType type,
-                          const wxPalette *palette = (wxPalette *)NULL) const = 0;
+                          const wxPalette *palette = NULL) const = 0;
     virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0;
 
     /*