diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 8713884001..ae0bd262c5 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -189,9 +189,10 @@ public: // support for scaled bitmaps virtual void SetScaleFactor(double scale); virtual double GetScaleFactor() const; - virtual double GetScaledWidth() const; - virtual double GetScaledHeight() const; - virtual wxSize GetScaledSize() const; + + double GetScaledWidth() const; + double GetScaledHeight() const; + wxSize GetScaledSize() const; #if wxUSE_IMAGE virtual wxImage ConvertToImage() const = 0; diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 21ebdec47f..34132fd0ab 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -187,9 +187,10 @@ public: // provide stabs of scaled bitmaps functions, they are trivial here virtual void SetScaleFactor(double scale); virtual double GetScaleFactor() const; - virtual double GetScaledWidth() const; - virtual double GetScaledHeight() const; - virtual wxSize GetScaledSize() const; + + double GetScaledWidth() const; + double GetScaledHeight() const; + wxSize GetScaledSize() const; // implementation only from now on // ------------------------------- diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h index c45a34a583..c2fb3b1643 100644 --- a/interface/wx/bitmap.h +++ b/interface/wx/bitmap.h @@ -604,7 +604,7 @@ public: @since 2.9.5 */ - virtual double GetScaledHeight() const; + double GetScaledHeight() const; /** Returns the scaled size of the bitmap. @@ -620,7 +620,7 @@ public: @since 2.9.5 */ - virtual wxSize GetScaledSize() const; + wxSize GetScaledSize() const; /** Returns the scaled width of the bitmap. @@ -631,7 +631,7 @@ public: @since 2.9.5 */ - virtual double GetScaledWidth() const; + double GetScaledWidth() const; /** Returns the size of the bitmap in pixels.