Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add wxSize overloads to wxBitmap ctors and to wxBitmap::Create

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-14 13:57:51 +00:00
parent 72a9034bd4
commit 732d8c74f8
22 changed files with 129 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/palmos/bitmap.h
View File

@@ -58,7 +58,8 @@ public:
//
// NB: this ctor will create a DIB for 24 and 32bpp bitmaps, use ctor
// taking a DC argument if you want to force using DDB in this case
wxBitmap(int width, int height, int depth = -1);
wxBitmap(int width, int height, int depth = -1) { /*TODO*/ }
wxBitmap(const wxSize& sz, int depth = -1) { /*TODO*/ }
// Create a bitmap compatible with the given DC
wxBitmap(int width, int height, const wxDC& dc);
@@ -91,7 +92,7 @@ public:
return *this;
}
virtual ~wxBitmap();
virtual ~wxBitmap() {}
#if wxUSE_IMAGE && wxUSE_WXDIB
wxImage ConvertToImage() const;
@@ -111,7 +112,10 @@ public:
bool CopyFromDIB(const wxDIB& dib);
#endif
virtual bool Create(int width, int height, int depth = -1);
virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
{ return Create(sz.GetWidth(), sz.GetHeight(), depth); }
virtual bool Create(int width, int height, const wxDC& dc);
virtual bool Create(const void* data, long type, int width, int height, int depth = 1);
virtual bool LoadFile(const wxString& name, long type = wxBITMAP_DEFAULT_TYPE);