AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adding new constructor for best dc-compatibility of bitmaps

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2013-06-15 16:29:04 +00:00
parent 5c475284a2
commit 68d5ce9099
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/osx/bitmap.h
View File

@ -107,6 +107,9 @@ public:
wxBitmap(CGImageRef image);
wxBitmap(WX_NSImage image);
// Create a bitmap compatible with the given DC
wxBitmap(int width, int height, const wxDC& dc);
// If depth is omitted, will create a bitmap compatible with the display
wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }

6
src/osx/core/bitmap.cpp
View File

@ -939,6 +939,11 @@ wxBitmap::wxBitmap(const void* data, wxBitmapType type, int width, int height, i
(void) Create(data, type, width, height, depth);
}
wxBitmap::wxBitmap(int width, int height, const wxDC& WXUNUSED(dc))
{
(void) Create(width, height);
}
wxBitmap::wxBitmap(const wxString& filename, wxBitmapType type)
{
LoadFile(filename, type);
@ -1113,7 +1118,6 @@ bool wxBitmap::Create(int w, int h, int d)
return M_BITMAPDATA->IsOk() ;
}
bool wxBitmap::Create(CGImageRef image)
{
UnRef();