customdrawn tests: Adds more tests

git-svn-id: trunk@33418 -

test/customdrawn/cd_test_all.lpr

@@ -1,10 +1,9 @@
-
-{$R *.res}
-
 program cd_test_all;
 
 {$mode objfpc}{$H+}
 
+{$R *.res}
+
 uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,

test/customdrawn/mainform.lfm

@@ -1,19 +1,18 @@
 object Form1: TForm1
   Left = 264
-  Height = 496
-  Top = 131
-  Width = 459
+  Height = 500
+  Top = 127
+  Width = 463
   Caption = 'Custom Drawn Controls Tester'
-  ClientHeight = 496
-  ClientWidth = 459
+  ClientHeight = 500
+  ClientWidth = 463
   LCLVersion = '0.9.31'
   object comboControls: TComboBox
     Left = 80
-    Height = 21
+    Height = 27
     Top = 12
     Width = 136
-    ItemHeight = 13
-    ItemIndex = 0
+    ItemHeight = 0
     Items.Strings = (
       'TCDMenu'
       'TCDPopUp'
@@ -28,12 +27,16 @@ object Form1: TForm1
       'TCDScrollBar'
       'TCDGroupBox '
       'TCDPanel'
+      'TCDButton with Glyph'
       'TCDStaticText'
       'TCDTrackBar'
-      'TCDCustomTabControl'
-      'TCDCustomTabControl'
-      'TCDCustomTabControl'
-      'TCDCustomTabControl'
+      'TCDProgressBar'
+      'TCDListView'
+      'TCDToolBar'
+      'TCDPageControl'
+      'TCDTabControl'
+      'TCDPageControl'
+      'TCDTabControl'
     )
     OnChange = comboControlsChange
     TabOrder = 0
@@ -49,11 +52,14 @@ object Form1: TForm1
   end
   object notebookControls: TNotebook
     AnchorSideLeft.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 0
     Height = 240
     Top = 40
-    Width = 439
-    PageIndex = 14
+    Width = 463
+    PageIndex = 0
+    Anchors = [akTop, akLeft, akRight]
     TabOrder = 2
     TabStop = True
     object pageMenu: TPage
@@ -161,7 +167,7 @@ object Form1: TForm1
         TabOrder = 0
       end
     end
-    object Page1: TPage
+    object pageToggleBoxes: TPage
     end
     object pageCheckboxes: TPage
       object CheckBox1: TCheckBox
@@ -190,45 +196,83 @@ object Form1: TForm1
       end
     end
     object pageRadioButton: TPage
-      object RadioButton1: TRadioButton
-        Left = 16
-        Height = 17
-        Top = 30
-        Width = 83
-        Caption = 'RadioButton1'
+      object GroupBox2: TGroupBox
+        Left = 8
+        Height = 89
+        Top = 16
+        Width = 137
+        Caption = 'GroupBox2'
+        ClientHeight = 70
+        ClientWidth = 133
         TabOrder = 0
+        object RadioButton3: TRadioButton
+          Left = 8
+          Height = 21
+          Top = 42
+          Width = 109
+          Caption = 'RadioButton3'
+          TabOrder = 0
+        end
+        object RadioButton2: TRadioButton
+          Left = 8
+          Height = 21
+          Top = 26
+          Width = 109
+          Caption = 'RadioButton2'
+          TabOrder = 1
+        end
+        object RadioButton1: TRadioButton
+          Left = 8
+          Height = 21
+          Top = 8
+          Width = 109
+          Caption = 'RadioButton1'
+          Checked = True
+          TabOrder = 2
+          TabStop = True
+        end
       end
-      object RadioButton2: TRadioButton
-        Left = 16
-        Height = 17
-        Top = 48
-        Width = 83
-        Caption = 'RadioButton2'
+      object GroupBox3: TGroupBox
+        Left = 168
+        Height = 88
+        Top = 16
+        Width = 129
+        Caption = 'GroupBox3'
+        ClientHeight = 69
+        ClientWidth = 125
         TabOrder = 1
-      end
-      object RadioButton3: TRadioButton
-        Left = 16
-        Height = 17
-        Top = 64
-        Width = 83
-        Caption = 'RadioButton3'
-        TabOrder = 2
-      end
-      object CDRadioButton1: TCDRadioButton
-        Left = 136
-        Height = 16
-        Top = 32
-        Width = 101
-        DrawStyle = dsCommon
-        Caption = 'dsCommon'
-        TabStop = False
+        object CDRadioButton2: TCDRadioButton
+          Left = 14
+          Height = 20
+          Top = 47
+          Width = 95
+          DrawStyle = dsDefault
+          Caption = 'dsCommon'
+        end
+        object CDRadioButton1: TCDRadioButton
+          Left = 14
+          Height = 20
+          Top = 7
+          Width = 95
+          DrawStyle = dsCommon
+          Caption = 'dsCommon'
+          TabStop = False
+        end
+        object CDRadioButton3: TCDRadioButton
+          Left = 14
+          Height = 20
+          Top = 27
+          Width = 95
+          DrawStyle = dsDefault
+          Caption = 'dsCommon'
+        end
       end
     end
-    object Page5: TPage
+    object pageListBoxes: TPage
     end
-    object Page6: TPage
+    object pageComboBoxes: TPage
     end
-    object Page7: TPage
+    object pageScrollBars: TPage
     end
     object pageGroupBoxes: TPage
       object GroupBox1: TGroupBox
@@ -237,7 +281,7 @@ object Form1: TForm1
         Top = 13
         Width = 129
         Caption = 'GroupBox1'
-        ClientHeight = 82
+        ClientHeight = 81
         ClientWidth = 125
         TabOrder = 0
         object Label1: TLabel
@@ -292,7 +336,17 @@ object Form1: TForm1
         Caption = 'dsWinCE'
       end
     end
-    object Page2: TPage
+    object pagePanels: TPage
+      object Panel1: TPanel
+        Left = 8
+        Height = 66
+        Top = 8
+        Width = 98
+        Caption = 'Native'
+        TabOrder = 0
+      end
+    end
+    object pageButtonGlyph: TPage
     end
     object pageStaticTexts: TPage
       object StaticText6: TStaticText
@@ -419,7 +473,15 @@ object Form1: TForm1
         TabOrder = 4
       end
     end
-    object Page8: TPage
+    object pageProgressBars: TPage
+    end
+    object Page3: TPage
+    end
+    object Page4: TPage
+    end
+    object Page1: TPage
+    end
+    object Page2: TPage
     end
     object pagePageControls: TPage
       object CDPageControl1: TCDPageControl
@@ -435,16 +497,16 @@ object Form1: TForm1
         TabIndex = 1
         object CDTabSheet2: TCDTabSheet
           Left = 2
-          Height = 77
-          Top = 25
+          Height = 73
+          Top = 29
           Width = 196
           Caption = 'CDTabSheet2'
           TabVisible = False
         end
         object CDTabSheet1: TCDTabSheet
           Left = 2
-          Height = 77
-          Top = 25
+          Height = 73
+          Top = 29
           Width = 196
           Caption = 'CDTabSheet1'
           TabVisible = False
@@ -497,24 +559,24 @@ object Form1: TForm1
         TabIndex = 2
         object CDTabSheet3: TCDTabSheet
           Left = 2
-          Height = 69
-          Top = 25
+          Height = 65
+          Top = 29
           Width = 188
           Caption = 'CDTabSheet3'
           TabVisible = False
         end
         object CDTabSheet4: TCDTabSheet
           Left = 2
-          Height = 69
-          Top = 25
+          Height = 65
+          Top = 29
           Width = 188
           Caption = 'CDTabSheet4'
           TabVisible = False
         end
         object CDTabSheet5: TCDTabSheet
           Left = 2
-          Height = 69
-          Top = 25
+          Height = 65
+          Top = 29
           Width = 188
           Caption = 'CDTabSheet5'
           TabVisible = False
@@ -539,9 +601,9 @@ object Form1: TForm1
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 7
-    Height = 186
+    Height = 190
     Top = 303
-    Width = 445
+    Width = 449
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 7
     BorderSpacing.Right = 7

test/customdrawn/mainform.pas

@@ -25,6 +25,8 @@ type
     CDEdit1: TCDEdit;
     CDEdit2: TCDEdit;
     CDRadioButton1: TCDRadioButton;
+    CDRadioButton2: TCDRadioButton;
+    CDRadioButton3: TCDRadioButton;
     CDStaticText1: TCDStaticText;
     CDTrackBar2: TCDTrackBar;
     CDTrackBar4: TCDTrackBar;
@@ -42,6 +44,8 @@ type
     comboControls: TComboBox;
     Edit1: TEdit;
     GroupBox1: TGroupBox;
+    GroupBox2: TGroupBox;
+    GroupBox3: TGroupBox;
     Label1: TLabel;
     Label2: TLabel;
     Label3: TLabel;
@@ -56,15 +60,20 @@ type
     notebookControls: TNotebook;
     Page1: TPage;
     Page2: TPage;
+    Page3: TPage;
+    Page4: TPage;
+    pageScrollBars: TPage;
+    pageToggleBoxes: TPage;
+    pageComboBoxes: TPage;
     pageStaticTexts: TPage;
     pageMenu: TPage;
     pagePopUp: TPage;
     pageEditMultiline: TPage;
     pageRadioButton: TPage;
-    Page5: TPage;
-    Page6: TPage;
-    Page7: TPage;
-    Page8: TPage;
+    pagePanels: TPage;
+    pageButtonGlyph: TPage;
+    pageListBoxes: TPage;
+    pageProgressBars: TPage;
     pageButtons: TPage;
     PageControl1: TPageControl;
     pageEdits: TPage;
@@ -73,6 +82,7 @@ type
     pageTrackBars: TPage;
     pagePageControls: TPage;
     pageTabControls: TPage;
+    Panel1: TPanel;
     RadioButton1: TRadioButton;
     RadioButton2: TRadioButton;
     RadioButton3: TRadioButton;