Make png images work at design-time and especially make it less akward for [Code] by having a regular PngImage property.

Components/BitmapButton.pas

@@ -6,11 +6,11 @@ unit BitmapButton;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  A TImage-like component for bitmaps without the TPicture bloat and
+  A TImage-like component for bitmaps and png files without the TPicture bloat and
   which is actually a button with a focus rectangle when focused - in
   other words: an accessible TImage
 
-  Also supports other TGraphic types which can be assigned to a TBitmap, like TPngImage
+  Also supports other TGraphic types which can be assigned to a TBitmap
   
   Make sure to set the Caption property, even if it isn't visible
 
@@ -20,7 +20,7 @@ unit BitmapButton;
 interface
 
 uses
-  Windows, Messages, Controls, Graphics, Classes,
+  Windows, Messages, Controls, Graphics, Classes, Imaging.pngimage,
   BitmapImage;
 
 type
@@ -32,6 +32,7 @@ type
     procedure SetBitmap(Value: TBitmap);
     procedure SetCenter(Value: Boolean);
     procedure SetGraphic(Value: TGraphic);
+    procedure SetPngImage(Value: TPngImage);
     procedure SetReplaceColor(Value: TColor);
     procedure SetReplaceWithColor(Value: TColor);
     procedure SetStretch(Value: Boolean);
@@ -53,11 +54,12 @@ type
     property Anchors;
     property AutoSize: Boolean read FImpl.AutoSize write SetAutoSize default False;
     property BackColor: TColor read FImpl.BackColor write SetBackColor default clNone;
+    property Bitmap: TBitmap read FImpl.Bitmap write SetBitmap;
     property Caption;
     property Center: Boolean read FImpl.Center write SetCenter default True;
     property Enabled;
     property ParentShowHint;
-    property Bitmap: TBitmap read FImpl.Bitmap write SetBitmap;
+    property PngImage: TPngImage read FImpl.PngImage write SetPngImage;
     property PopupMenu;
     property ShowHint;
     property Stretch: Boolean read FImpl.Stretch write SetStretch default False;
@@ -137,6 +139,11 @@ begin
   FImpl.SetGraphic(Value);
 end;
 
+procedure TBitmapButton.SetPngImage(Value: TPngImage);
+begin
+  FImpl.SetPngImage(Value);
+end;
+
 procedure TBitmapButton.SetReplaceColor(Value: TColor);
 begin
   FImpl.SetReplaceColor(Self, Value);

Components/BitmapImage.pas

@@ -6,9 +6,9 @@ unit BitmapImage;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  A TImage-like component for bitmaps without the TPicture bloat
+  A TImage-like component for bitmaps and png files without the TPicture bloat
   
-  Also supports other TGraphic types which can be assigned to a TBitmap, like TPngImage
+  Also supports other TGraphic types which can be assigned to a TBitmap
 
   Also see TBitmapButton which is the TWinControl version
 }
@@ -16,7 +16,7 @@ unit BitmapImage;
 interface
 
 uses
-  Windows, Controls, Graphics, Classes;
+  Windows, Controls, Graphics, Classes, Imaging.pngimage;
 
 type
   TPaintEvent = procedure(Sender: TObject; Canvas: TCanvas; var ARect: TRect) of object;
@@ -30,6 +30,7 @@ type
     BackColor: TColor;
     Bitmap: TBitmap;
     Center: Boolean;
+    PngImage: TPngImage;
     ReplaceColor: TColor;
     ReplaceWithColor: TColor;
     Stretch: Boolean;
@@ -41,11 +42,13 @@ type
     procedure DeInit;
     function InitializeFromIcon(const Instance: HINST; const Name: PChar; const BkColor: TColor; const AscendingTrySizes: array of Integer): Boolean;
     procedure BitmapChanged(Sender: TObject);
+    procedure PngImageChanged(Sender: TObject);
     procedure SetAutoSize(Sender: TObject; Value: Boolean);
     procedure SetBackColor(Sender: TObject; Value: TColor);
     procedure SetBitmap(Value: TBitmap);
     procedure SetCenter(Sender: TObject; Value: Boolean);
     procedure SetGraphic(Value: TGraphic);
+    procedure SetPngImage(Value: TPngImage);
     procedure SetReplaceColor(Sender: TObject; Value: TColor);
     procedure SetReplaceWithColor(Sender: TObject; Value: TColor);
     procedure SetStretch(Sender: TObject; Value: Boolean);
@@ -60,6 +63,7 @@ type
     procedure SetBitmap(Value: TBitmap);
     procedure SetCenter(Value: Boolean);
     procedure SetGraphic(Value: TGraphic);
+    procedure SetPngImage(Value: TPngImage);
     procedure SetReplaceColor(Value: TColor);
     procedure SetReplaceWithColor(Value: TColor);
     procedure SetStretch(Value: Boolean);
@@ -83,6 +87,7 @@ type
     property DragMode;
     property Enabled;
     property ParentShowHint;
+    property PngImage: TPngImage read FImpl.PngImage write SetPngImage;
     property PopupMenu;
     property ShowHint;
     property Stretch: Boolean read FImpl.Stretch write SetStretch default False;
@@ -121,9 +126,11 @@ begin
   FControl := AControl;
   AutoSizeExtraWidth := AAutoSizeExtraWidth;
   AutoSizeExtraHeight := AAutoSizeExtraHeight;
+  BackColor := clNone;
   Bitmap := TBitmap.Create;
   Bitmap.OnChange := BitmapChanged;
-  BackColor := clNone;
+  PngImage := TPngImage.Create;
+  PngImage.OnChange := PngImageChanged;
   ReplaceColor := clNone;
   ReplaceWithColor := clNone;
   StretchedBitmap := TBitmap.Create;
@@ -187,6 +194,11 @@ begin
   FControl.Invalidate;
 end;
 
+procedure TBitmapImageImplementation.PngImageChanged(Sender: TObject);
+begin
+  Bitmap.Assign(PngImage);
+end;
+
 procedure TBitmapImageImplementation.SetAutoSize(Sender: TObject; Value: Boolean);
 begin
   AutoSize := Value;
@@ -216,7 +228,15 @@ end;
 
 procedure TBitmapImageImplementation.SetGraphic(Value: TGraphic);
 begin
-  Bitmap.Assign(Value);
+  if Value is TPngImage then
+    SetPngImage(Value as TPngImage)
+  else
+    Bitmap.Assign(Value);
+end;
+
+procedure TBitmapImageImplementation.SetPngImage(Value: TPngImage);
+begin
+  PngImage.Assign(Value);
 end;
 
 procedure TBitmapImageImplementation.SetReplaceColor(Sender: TObject; Value: TColor);
@@ -366,6 +386,11 @@ begin
   FImpl.SetGraphic(Value);
 end;
 
+procedure TBitmapImage.SetPngImage(Value: TPngImage);
+begin
+  FImpl.SetPngImage(Value);
+end;
+
 procedure TBitmapImage.SetReplaceColor(Value: TColor);
 begin
   FImpl.SetReplaceColor(Self, Value);