X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..3ef4e126a2198e33ad3ec09a0211d5579865d880:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 51400743f6..770dd5153a 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -6,14 +6,9 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __WX_BITMAP_H__ #define __WX_BITMAP_H__ -#ifdef __GNUG__ -#pragma interface "bitmap.h" -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -45,7 +40,7 @@ public: wxMask(const wxBitmap& bitmap, const wxColour& colour); wxMask(const wxBitmap& bitmap, int paletteIndex); wxMask(const wxBitmap& bitmap); - ~wxMask(); + virtual ~wxMask(); bool Create(const wxBitmap& bitmap, const wxColour& colour); bool Create(const wxBitmap& bitmap, int paletteIndex); @@ -80,11 +75,9 @@ public: wxBitmap(const char bits[], int width, int height, int depth = 1); wxBitmap(const char **bits) { CreateFromXpm(bits); } wxBitmap(char **bits) { CreateFromXpm((const char **)bits); } - wxBitmap(const wxBitmap& bmp); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); wxBitmap(const wxImage& image, int depth = -1); - ~wxBitmap() {} - wxBitmap& operator = (const wxBitmap& bmp); + virtual ~wxBitmap() {} bool operator == (const wxBitmap& bmp) const; bool operator != (const wxBitmap& bmp) const; bool Ok() const;