From: Francesco Montorsi Date: Sat, 29 Nov 2008 00:24:57 +0000 (+0000) Subject: add GetSize also to wxGDIImage since wxBitmap under some ports derives from wxGDIImag... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/339cfab649b54f6f3c8f5637ede885cf11f85501?ds=inline add GetSize also to wxGDIImage since wxBitmap under some ports derives from wxGDIImage and not from wxBitmapBase git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/gdiimage.h b/include/wx/msw/gdiimage.h index 6ab0fa5a77..d39a52b79e 100644 --- a/include/wx/msw/gdiimage.h +++ b/include/wx/msw/gdiimage.h @@ -113,6 +113,12 @@ public: int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; } int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_depth; } + wxSize GetSize() const + { + return IsNull() ? wxSize(0,0) : + wxSize(GetGDIImageData()->m_width, GetGDIImageData()->m_height); + } + void SetWidth(int w) { AllocExclusive(); GetGDIImageData()->m_width = w; } void SetHeight(int h) { AllocExclusive(); GetGDIImageData()->m_height = h; } void SetDepth(int d) { AllocExclusive(); GetGDIImageData()->m_depth = d; } diff --git a/include/wx/os2/gdiimage.h b/include/wx/os2/gdiimage.h index 8b5625abdf..7d96b89e9f 100644 --- a/include/wx/os2/gdiimage.h +++ b/include/wx/os2/gdiimage.h @@ -191,6 +191,12 @@ public: int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; } int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; } + wxSize GetSize() const + { + return IsNull() ? wxSize(0,0) : + wxSize(GetGDIImageData()->m_nWidth, GetGDIImageData()->m_nHeight); + } + void SetWidth(int nW) { EnsureHasData(); GetGDIImageData()->m_nWidth = nW; } void SetHeight(int nH) { EnsureHasData(); GetGDIImageData()->m_nHeight = nH; } void SetDepth(int nD) { EnsureHasData(); GetGDIImageData()->m_nDepth = nD; } diff --git a/include/wx/palmos/gdiimage.h b/include/wx/palmos/gdiimage.h index 512d373a28..db0d112c37 100644 --- a/include/wx/palmos/gdiimage.h +++ b/include/wx/palmos/gdiimage.h @@ -151,6 +151,12 @@ public: int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_height; } int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_depth; } + wxSize GetSize() const + { + return IsNull() ? wxSize(0,0) : + wxSize(GetGDIImageData()->m_width, GetGDIImageData()->m_height); + } + void SetWidth(int w) { EnsureHasData(); GetGDIImageData()->m_width = w; } void SetHeight(int h) { EnsureHasData(); GetGDIImageData()->m_height = h; } void SetDepth(int d) { EnsureHasData(); GetGDIImageData()->m_depth = d; }