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

Don't make wxBitmap::GetScaledXXX() virtual

Browse Source 
There should be never any need to override them, their behaviour is
fixed.

No real changes.
This commit is contained in:
Vadim Zeitlin
2022-01-06 15:43:57 +00:00
parent bbdbee3e57
commit 10977b0eb6
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/bitmap.h
View File

@@ -189,9 +189,10 @@ public:
// support for scaled bitmaps // support for scaled bitmaps
virtual void SetScaleFactor(double scale); virtual void SetScaleFactor(double scale);
virtual double GetScaleFactor() const; virtual double GetScaleFactor() const;
virtual double GetScaledWidth() const;
virtual double GetScaledHeight() const; double GetScaledWidth() const;
virtual wxSize GetScaledSize() const; double GetScaledHeight() const;
wxSize GetScaledSize() const;
#if wxUSE_IMAGE #if wxUSE_IMAGE
virtual wxImage ConvertToImage() const = 0; virtual wxImage ConvertToImage() const = 0;

7
include/wx/msw/bitmap.h
View File

@@ -187,9 +187,10 @@ public:
// provide stabs of scaled bitmaps functions, they are trivial here // provide stabs of scaled bitmaps functions, they are trivial here
virtual void SetScaleFactor(double scale); virtual void SetScaleFactor(double scale);
virtual double GetScaleFactor() const; virtual double GetScaleFactor() const;
virtual double GetScaledWidth() const;
virtual double GetScaledHeight() const; double GetScaledWidth() const;
virtual wxSize GetScaledSize() const; double GetScaledHeight() const;
wxSize GetScaledSize() const;
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------

6
interface/wx/bitmap.h
View File

@@ -604,7 +604,7 @@ public:
@since 2.9.5 @since 2.9.5
*/ */
virtual double GetScaledHeight() const; double GetScaledHeight() const;
/** /**
Returns the scaled size of the bitmap. Returns the scaled size of the bitmap.
@@ -620,7 +620,7 @@ public:
@since 2.9.5 @since 2.9.5
*/ */
virtual wxSize GetScaledSize() const; wxSize GetScaledSize() const;
/** /**
Returns the scaled width of the bitmap. Returns the scaled width of the bitmap.
@@ -631,7 +631,7 @@ public:
@since 2.9.5 @since 2.9.5
*/ */
virtual double GetScaledWidth() const; double GetScaledWidth() const;
/** /**
Returns the size of the bitmap in pixels. Returns the size of the bitmap in pixels.