Add wxStaticBitmap::SetScaleMode() to control bitmap display size

This allows a bitmap to scale with the size of the wxStaticBitmap control.
Scaling can be controlled to fill the control with or without changing the
bitmaps aspect ratio.

include/wx/generic/statbmpg.h

@@ -56,6 +56,13 @@ public:
     wxIcon GetIcon() const wxOVERRIDE  { return (const wxIcon &)m_bitmap; }
 #endif
 
+    virtual void SetScaleMode(ScaleMode scaleMode) wxOVERRIDE
+    {
+        m_scaleMode = scaleMode;
+        Refresh();
+    }
+
+    virtual ScaleMode GetScaleMode() const wxOVERRIDE { return m_scaleMode; }
 
 private:
     wxSize GetBitmapSize()
@@ -67,6 +74,7 @@ private:
     void OnPaint(wxPaintEvent& event);
 
     wxBitmap m_bitmap;
+    ScaleMode m_scaleMode;
 
     wxDECLARE_DYNAMIC_CLASS(wxGenericStaticBitmap);
 };

include/wx/statbmp.h

@@ -25,6 +25,14 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];
 class WXDLLIMPEXP_CORE wxStaticBitmapBase : public wxControl
 {
 public:
+    enum ScaleMode
+    {
+        Scale_None,
+        Scale_Fill,
+        Scale_AspectFit,
+        Scale_AspectFill
+    };
+
     wxStaticBitmapBase() { }
     virtual ~wxStaticBitmapBase();
 
@@ -38,6 +46,8 @@ public:
         // should)
         return wxIcon();
     }
+    virtual void SetScaleMode(ScaleMode WXUNUSED(scaleMode)) { }
+    virtual ScaleMode GetScaleMode() const { return Scale_None; }
 
     // overridden base class virtuals
     virtual bool AcceptsFocus() const wxOVERRIDE { return false; }