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

Rename wxBitmap::GetImage() to OSXGetImage()

Browse Source 
Make it more clear that this function is specific to Mac ports.
This commit is contained in:
Vadim Zeitlin
2021-09-03 21:31:45 +02:00
parent be923dc9fe
commit 2574b9172e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,16 +205,16 @@ public:
CGImageRef CreateCGImage() const ; CGImageRef CreateCGImage() const ;
// returns nil for invalid bitmap // returns nil for invalid bitmap
WXImage GetImage() const; WXImage OSXGetImage() const;
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
// returns an autoreleased version of the image // returns an autoreleased version of the image
WX_NSImage GetNSImage() const WX_NSImage GetNSImage() const
{ return GetImage(); } { return OSXGetImage(); }
#endif #endif
#if wxOSX_USE_IPHONE #if wxOSX_USE_IPHONE
// returns an autoreleased version of the image // returns an autoreleased version of the image
WX_UIImage GetUIImage() const WX_UIImage GetUIImage() const
{ return GetImage(); } { return OSXGetImage(); }
#endif #endif
#if WXWIN_COMPATIBILITY_3_0 #if WXWIN_COMPATIBILITY_3_0

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

@@ -782,7 +782,7 @@ wxBitmapRefData::~wxBitmapRefData()
bool wxBitmap::CopyFromIcon(const wxIcon& icon) bool wxBitmap::CopyFromIcon(const wxIcon& icon)
{ {
return Create( icon.GetImage() ); return Create( icon.OSXGetImage() );
} }
wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits) wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits)
@@ -949,7 +949,7 @@ bool wxBitmap::Create(CGContextRef bitmapcontext)
return GetBitmapData()->IsOk() ; return GetBitmapData()->IsOk() ;
} }
WXImage wxBitmap::GetImage() const WXImage wxBitmap::OSXGetImage() const
{ {
return IsOk() ? GetBitmapData()->GetImage() : NULL; return IsOk() ? GetBitmapData()->GetImage() : NULL;
} }