Added some properties to BCXButton.

bcimagebutton.pas

@@ -100,6 +100,9 @@ type
   published
     property OnRenderControl: TOnRenderControl
       read FOnRenderControl write FOnRenderControl;
+  published
+    property Caption;
+    property Enabled;
   end;
 
   { TBCSliceScalingOptions }

test/test_bccontrols/test_bcxbutton/test_bcxbutton.lpi

@@ -48,12 +48,6 @@
               </Win32>
             </Options>
           </Linking>
-          <Other>
-            <CompilerMessages>
-              <MsgFileName Value=""/>
-            </CompilerMessages>
-            <CompilerPath Value="$(CompPath)"/>
-          </Other>
         </CompilerOptions>
       </Item2>
     </BuildModes>
@@ -79,7 +73,6 @@
       <Unit0>
         <Filename Value="test_bcxbutton.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="test_bcxbutton"/>
       </Unit0>
       <Unit1>
         <Filename Value="utest.pas"/>
@@ -87,7 +80,6 @@
         <ComponentName Value="Form1"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="utest"/>
       </Unit1>
     </Units>
   </ProjectOptions>
@@ -130,12 +122,6 @@
         </Win32>
       </Options>
     </Linking>
-    <Other>
-      <CompilerMessages>
-        <MsgFileName Value=""/>
-      </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
-    </Other>
   </CompilerOptions>
   <Debugging>
     <Exceptions Count="3">

test/test_bccontrols/test_bcxbutton/utest.lfm

@@ -8,7 +8,7 @@ object Form1: TForm1
   ClientWidth = 491
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '1.1'
+  LCLVersion = '1.6.0.4'
   object vs1: TBGRAVirtualScreen
     Left = 0
     Height = 377
@@ -28,6 +28,7 @@ object Form1: TForm1
       Top = 160
       Width = 424
       OnRenderControl = BCXButton1RenderControl
+      Caption = 'Button 2'
     end
     object BCXButton1: TBCXButton
       Left = 16
@@ -35,6 +36,7 @@ object Form1: TForm1
       Top = 8
       Width = 136
       OnRenderControl = BCXButton1RenderControl
+      Caption = 'Button 1'
     end
     object BCXButton3: TBCXButton
       Left = 16
@@ -42,6 +44,7 @@ object Form1: TForm1
       Top = 56
       Width = 136
       OnRenderControl = BCXButton3RenderControl
+      Caption = 'Button 3'
     end
     object BCXButton4: TBCXButton
       Left = 16
@@ -49,6 +52,7 @@ object Form1: TForm1
       Top = 104
       Width = 136
       OnRenderControl = BCXButton3RenderControl
+      Caption = 'Button 4'
     end
     object BCXButton5: TBCXButton
       Left = 160
@@ -56,6 +60,7 @@ object Form1: TForm1
       Top = 8
       Width = 136
       OnRenderControl = BCXButton1RenderControl
+      Caption = 'Button 5'
     end
     object BCXButton6: TBCXButton
       Left = 304
@@ -63,6 +68,7 @@ object Form1: TForm1
       Top = 8
       Width = 136
       OnRenderControl = BCXButton1RenderControl
+      Caption = 'Button 6'
     end
     object BCXButton7: TBCXButton
       Left = 16
@@ -70,6 +76,7 @@ object Form1: TForm1
       Top = 232
       Width = 424
       OnRenderControl = BCXButton1RenderControl
+      Caption = 'Button 7'
     end
   end
 end

test/test_bccontrols/test_bcxbutton/utest.pas

@@ -143,11 +143,7 @@ begin
   //DrawBasicXButton(Sender, Bitmap, State);
 
   { Strings }
-  str := TControl(Sender).Name;
-  if str = BCXButton1.Name then
-    str := 'Button1'
-  else
-    str := 'BCXButton';
+  str := TControl(Sender).Caption;
 
   { Text }
   DrawXButtonText(Sender, Bitmap, State, str);
@@ -227,7 +223,7 @@ begin
 
   PaintRect := ThemeServices.ContentRect(Bitmap.Canvas.Handle, Details, PaintRect);
   AlphaRect := SaveAlphaRect(Bitmap, PaintRect);
-  ThemeServices.DrawText(Bitmap.Canvas, Details, 'Test caption', PaintRect,
+  ThemeServices.DrawText(Bitmap.Canvas, Details, TControl(Sender).Caption, PaintRect,
     DT_CENTER or DT_VCENTER or DT_SINGLELINE, 0);
   RestoreAlphaRectAndFree(Bitmap, PaintRect.Left,PaintRect.Top, AlphaRect);
 end;