provide GetSize() getters in wxBitmap and wxImage

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index b78cc41a36076c74b4dbf6cb5496e14fe6a7b4c3..f6fd27635ecb72d4d7201d0fbeeb2ede6d761e90 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -161,6 +161,9 @@ public:
     virtual int GetWidth() const = 0;
     virtual int GetDepth() const = 0;
 
+    wxSize GetSize() const
+        { return wxSize(GetWidth(), GetHeight()); }
+
 #if wxUSE_IMAGE
     virtual wxImage ConvertToImage() const = 0;
 #endif // wxUSE_IMAGE

diff --git a/include/wx/image.h b/include/wx/image.h
index ffb1e3777b9025115efecc1a81c1bab59144a9e3..84dcd3934d0ce72654e6672223d5529343e576a9 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -361,6 +361,9 @@ public:
     int GetWidth() const;
     int GetHeight() const;
 
+    wxSize GetSize() const
+        { return wxSize(GetWidth(), GetHeight()); }
+
     // Gets the type of image found by LoadFile or specified with SaveFile
     wxBitmapType GetType() const;
 

diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h
index 68c3ed8bc5ed919f6e5758f0099288a504bcfe99..3d1ec2000eb637b01e7fc3889c66a4b900e1a8dc 100644 (file)
--- a/interface/wx/bitmap.h
+++ b/interface/wx/bitmap.h
@@ -440,6 +440,8 @@ public:
 
     /**
         Gets the height of the bitmap in pixels.
+
+        @see GetWidth(), GetSize()
     */
     virtual int GetHeight() const;
 
@@ -465,10 +467,19 @@ public:
     */
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
+    /**
+        Returns the size of the bitmap in pixels.
+
+        @since 2.9.0
+
+        @see GetHeight(), GetWidth()
+    */
+    wxSize GetSize() const;
+
     /**
         Gets the width of the bitmap in pixels.
 
-        @see GetHeight()
+        @see GetHeight(), GetSize()
     */
     virtual int GetWidth() const;
 

diff --git a/interface/wx/image.h b/interface/wx/image.h
index 67710f92e40af1638b52ad2e7ab6bc181f8ebed9..4358c0e4da6f3906e08838c2bd20cdcf360e26eb 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -705,6 +705,8 @@ public:
 
     /**
         Gets the height of the image in pixels.
+
+        @see GetWidth(), GetSize()
     */
     int GetHeight() const;
 
@@ -876,6 +878,15 @@ public:
     */
     wxImage GetSubImage(const wxRect& rect) const;
 
+    /**
+        Returns the size of the image in pixels.
+
+        @since 2.9.0
+
+        @see GetHeight(), GetWidth()
+    */
+    wxSize GetSize() const;
+
     /**
         Gets the type of image found by LoadFile() or specified with SaveFile().
 
@@ -886,7 +897,7 @@ public:
     /**
         Gets the width of the image in pixels.
 
-        @see GetHeight()
+        @see GetHeight(), GetSize()
     */
     int GetWidth() const;