diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h index 6484a5e7e2..bae0e68537 100644 --- a/include/wx/osx/bitmap.h +++ b/include/wx/osx/bitmap.h @@ -205,16 +205,16 @@ public: CGImageRef CreateCGImage() const ; // returns nil for invalid bitmap - WXImage GetImage() const; + WXImage OSXGetImage() const; #if wxOSX_USE_COCOA // returns an autoreleased version of the image WX_NSImage GetNSImage() const - { return GetImage(); } + { return OSXGetImage(); } #endif #if wxOSX_USE_IPHONE // returns an autoreleased version of the image WX_UIImage GetUIImage() const - { return GetImage(); } + { return OSXGetImage(); } #endif #if WXWIN_COMPATIBILITY_3_0 diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp index b4e8163c6f..d7211a50e4 100644 --- a/src/osx/core/bitmap.cpp +++ b/src/osx/core/bitmap.cpp @@ -782,7 +782,7 @@ wxBitmapRefData::~wxBitmapRefData() 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) @@ -949,7 +949,7 @@ bool wxBitmap::Create(CGContextRef bitmapcontext) return GetBitmapData()->IsOk() ; } -WXImage wxBitmap::GetImage() const +WXImage wxBitmap::OSXGetImage() const { return IsOk() ? GetBitmapData()->GetImage() : NULL; }