Cleanup + fix Compil32.

Components/BitmapButton.pas

@@ -83,11 +83,6 @@ begin
   RegisterComponents('JR', [TBitmapButton]);
 end;
 
-function TBitmapButton.InitializeFromIcon(const Instance: HINST; const Name: PChar; const BkColor: TColor; const AscendingTrySizes: array of Integer): Boolean;
-begin
-  Result := FImpl.InitializeFromIcon(HInstance, Name, BkColor, AscendingTrySizes);
-end;
-
 constructor TBitmapButton.Create(AOwner: TComponent);
 begin
   inherited;
@@ -110,6 +105,11 @@ begin
   inherited;
 end;
 
+function TBitmapButton.InitializeFromIcon(const Instance: HINST; const Name: PChar; const BkColor: TColor; const AscendingTrySizes: array of Integer): Boolean;
+begin
+  Result := FImpl.InitializeFromIcon(HInstance, Name, BkColor, AscendingTrySizes);
+end;
+
 procedure TBitmapButton.SetAutoSize(Value: Boolean);
 begin
   FImpl.SetAutoSize(Self, Value);

Components/BitmapImage.pas

@@ -302,11 +302,6 @@ end;
 
 { TBitmapImage }
 
-function TBitmapImage.InitializeFromIcon(const Instance: HINST; const Name: PChar; const BkColor: TColor; const AscendingTrySizes: array of Integer): Boolean;
-begin
-  Result := FImpl.InitializeFromIcon(HInstance, Name, BkColor, AscendingTrySizes);
-end;
-
 constructor TBitmapImage.Create(AOwner: TComponent);
 begin
   inherited;
@@ -323,6 +318,11 @@ begin
   inherited;
 end;
 
+function TBitmapImage.InitializeFromIcon(const Instance: HINST; const Name: PChar; const BkColor: TColor; const AscendingTrySizes: array of Integer): Boolean;
+begin
+  Result := FImpl.InitializeFromIcon(HInstance, Name, BkColor, AscendingTrySizes);
+end;
+
 procedure TBitmapImage.SetAutoSize(Value: Boolean);
 begin
   FImpl.SetAutoSize(Self, Value);

Projects/Compil32.dpr

@@ -48,6 +48,7 @@ uses
   BidiUtils in '..\Components\BidiUtils.pas',
   DropListBox in '..\Components\DropListBox.pas',
   BitmapButton in '..\Components\BitmapButton.pas',
+  BitmapImage in '..\Components\BitmapImage.pas',
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
   TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',

Projects/Compil32.dproj

@@ -128,6 +128,7 @@
         <DCCReference Include="..\Components\BidiUtils.pas"/>
         <DCCReference Include="..\Components\DropListBox.pas"/>
         <DCCReference Include="..\Components\BitmapButton.pas"/>
+        <DCCReference Include="..\Components\BitmapImage.pas"/>
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
         <DCCReference Include="..\Components\TaskbarProgressFunc.pas"/>