X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..715efa4e254cf811bd14617d121b92fa82d64f8c:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 3fbbb9b73d..8e9d550ac2 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bitmap.h +// Name: wx/mgl/bitmap.h // Author: Vaclav Slavik // RCS-ID: $Id$ // Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) @@ -27,14 +27,19 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() {} - wxBitmap(int width, int height, int depth = -1); + wxBitmap(int width, int height, int depth = -1) + { Create(width, height, depth); } + wxBitmap(const wxSize& sz, int depth = -1) + { Create(sz, depth); } wxBitmap(const char bits[], int width, int height, int depth = 1); wxBitmap(const char* const* bits); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); wxBitmap(const wxImage& image, int depth = -1); virtual ~wxBitmap() {} - bool Create(int width, int height, int depth = -1); + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } virtual int GetHeight() const; virtual int GetWidth() const; @@ -47,7 +52,7 @@ public: virtual wxBitmap GetSubBitmap(const wxRect& rect) const; - virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const; + virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const; virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); virtual wxPalette *GetPalette() const;