From 9b307a69b39d69605f609ebc7ef22798d045656b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 23 Oct 2010 21:47:22 +0000 Subject: [PATCH] Add wxIcon::GetSize() to wxIcon in wxOSX. This fixes the compilation errors under OS X after r65884 due to the lack of this method there. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/cocoa/icon.h | 2 ++ include/wx/osx/icon.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index ebeb2975f8..3d1f3f8615 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -48,6 +48,8 @@ public: int GetWidth() const; int GetHeight() const; + wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } + WX_NSImage GetNSImage() const; bool CreateFromXpm(const char* const* bits); diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h index 1728e07ec5..d552bf8995 100644 --- a/include/wx/osx/icon.h +++ b/include/wx/osx/icon.h @@ -50,6 +50,8 @@ public: void SetDepth(int d); void SetOk(bool isOk); + wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } + WXHICON GetHICON() const; protected: -- 2.50.0