* added widgetsets by Paul

git-svn-id: trunk@10893 -

tools/apiwizz/apiwizard.lfm

@@ -1,7 +1,7 @@
 object ApiWizForm: TApiWizForm
-  Left = 392
+  Left = 396
   Height = 383
-  Top = 134
+  Top = 170
   Width = 583
   HorzScrollBar.Page = 582
   VertScrollBar.Page = 382
@@ -11,7 +11,7 @@ object ApiWizForm: TApiWizForm
   Position = poDefaultPosOnly
   object lblDeclare: TLabel
     Left = 4
-    Height = 14
+    Height = 13
     Top = 56
     Width = 404
     Anchors = [akTop, akLeft, akRight]
@@ -21,9 +21,9 @@ object ApiWizForm: TApiWizForm
   end
   object lblLazarus: TLabel
     Left = 4
-    Height = 14
+    Height = 13
     Top = 8
-    Width = 57
+    Width = 66
     Caption = 'Lazarus dir:'
     Color = clNone
     ParentColor = False
@@ -31,7 +31,7 @@ object ApiWizForm: TApiWizForm
   object cmdGenerate: TButton
     Left = 416
     Height = 28
-    Top = 256
+    Top = 299
     Width = 162
     Anchors = [akTop, akRight]
     BorderSpacing.InnerBorder = 4
@@ -51,7 +51,7 @@ object ApiWizForm: TApiWizForm
   object rdgApiType: TRadioGroup
     Left = 416
     Height = 72
-    Top = 176
+    Top = 219
     Width = 162
     Anchors = [akTop, akRight]
     AutoFill = True
@@ -74,18 +74,18 @@ object ApiWizForm: TApiWizForm
   end
   object Groupbox1: TGroupBox
     Left = 416
-    Height = 160
+    Height = 208
     Top = 8
     Width = 162
     Anchors = [akTop, akRight]
-    Caption = 'LCL Platform'
+    Caption = 'LCL Widgetset'
     ParentCtl3D = False
     TabOrder = 3
     object rbIndependent: TRadioButton
       Left = 10
-      Height = 13
+      Height = 20
       Top = 3
-      Width = 80
+      Width = 96
       AllowGrayed = True
       Caption = 'Independent'
       Checked = True
@@ -95,7 +95,7 @@ object ApiWizForm: TApiWizForm
     end
     object cbgLCLPlatform: TCheckGroup
       Left = 26
-      Height = 107
+      Height = 154
       Top = 30
       Width = 128
       AutoFill = True
@@ -109,22 +109,24 @@ object ApiWizForm: TApiWizForm
       ChildSizing.ControlsPerLine = 1
       Enabled = False
       Items.Strings = (
+        'carbon'
         'fpgui'
         'gtk'
         'gtk2'
         'qt'
         'win32'
+        'wince'
       )
       TabOrder = 2
       Data = {
-        050000000202020202
+        0700000002020202020202
       }
     end
     object rbDependent: TRadioButton
       Left = 10
-      Height = 13
+      Height = 20
       Top = 30
-      Width = 73
+      Width = 88
       AllowGrayed = True
       Caption = 'Dependent'
       OnClick = rbPlatformDependencyClick

tools/apiwizz/apiwizard.lrs

@@ -1,48 +1,48 @@
-{ This is an automatically generated lazarus resource file }
+{ Ýòî - ôàéë ðåñóðñîâ, àâòîìàòè÷åñêè ñîçäàííûé lazarus }
 
 LazarusResources.Add('TApiWizForm','FORMDATA',[
-  'TPF0'#11'TApiWizForm'#10'ApiWizForm'#4'Left'#3#136#1#6'Height'#3''#1#3'Top'
+  'TPF0'#11'TApiWizForm'#10'ApiWizForm'#4'Left'#3#140#1#6'Height'#3''#1#3'Top'
-  +#3#134#0#5'Width'#3'G'#2#18'HorzScrollBar.Page'#3'F'#2#18'VertScrollBar.Page'
+  +#3#170#0#5'Width'#3'G'#2#18'HorzScrollBar.Page'#3'F'#2#18'VertScrollBar.Page'
   +#3'~'#1#13'ActiveControl'#7#10'txtLazarus'#7'Caption'#6#7'ApiWiZZ'#8'OnCreat'
   +'e'#7#16'ApiWizFormCreate'#8'Position'#7#16'poDefaultPosOnly'#0#6'TLabel'#10
-  +'lblDeclare'#4'Left'#2#4#6'Height'#2#14#3'Top'#2'8'#5'Width'#3#148#1#7'Ancho'
+  +'lblDeclare'#4'Left'#2#4#6'Height'#2#13#3'Top'#2'8'#5'Width'#3#148#1#7'Ancho'
   +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6',Declaration (each line'
   +' is a separate entry):'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'
-  +#10'lblLazarus'#4'Left'#2#4#6'Height'#2#14#3'Top'#2#8#5'Width'#2'9'#7'Captio'
+  +#10'lblLazarus'#4'Left'#2#4#6'Height'#2#13#3'Top'#2#8#5'Width'#2'B'#7'Captio'
   +'n'#6#12'Lazarus dir:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#7'TButton'
-  +#11'cmdGenerate'#4'Left'#3#160#1#6'Height'#2#28#3'Top'#3#0#1#5'Width'#3#162#0
+  +#11'cmdGenerate'#4'Left'#3#160#1#6'Height'#2#28#3'Top'#3'+'#1#5'Width'#3#162
-  +#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Cap'
+  +#0#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'C'
-  +'tion'#6#8'Generate'#7'OnClick'#7#16'cmdGenerateClick'#8'TabOrder'#2#1#0#0#5
+  +'aption'#6#8'Generate'#7'OnClick'#7#16'cmdGenerateClick'#8'TabOrder'#2#1#0#0
-  +'TEdit'#10'txtLazarus'#3'Tag'#3#237#1#4'Left'#2#4#6'Height'#2#24#3'Top'#2#24
+  +#5'TEdit'#10'txtLazarus'#3'Tag'#3#237#1#4'Left'#2#4#6'Height'#2#24#3'Top'#2
-  +#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2
+  +#24#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrde'
-  +#0#0#0#11'TRadioGroup'#10'rdgApiType'#4'Left'#3#160#1#6'Height'#2'H'#3'Top'#3
+  +'r'#2#0#0#0#11'TRadioGroup'#10'rdgApiType'#4'Left'#3#160#1#6'Height'#2'H'#3
-  +#176#0#5'Width'#3#162#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoFill'#9#7
+  +'Top'#3#219#0#5'Width'#3#162#0#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoFil'
-  +'Caption'#6#8'Api type'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.'
+  +'l'#9#7'Caption'#6#8'Api type'#28'ChildSizing.LeftRightSpacing'#2#6#28'Child'
-  +'TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousC'
+  +'Sizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomo'
-  +'hildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'
+  +'genousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildR'
-  +#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shrink'
+  +'esize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing'
-  +'Vertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh'
+  +'.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftTo'
-  +'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#9'ItemIndex'#2#0#13'Item'
+  +'RightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#9'ItemIndex'#2#0
-  +'s.Strings'#1#6#19'win32 compatibility'#6#13'LCL interface'#0#7'OnClick'#7#15
+  +#13'Items.Strings'#1#6#19'win32 compatibility'#6#13'LCL interface'#0#7'OnCli'
-  +'rdgApiTypeClick'#8'TabOrder'#2#2#0#0#9'TGroupBox'#9'Groupbox1'#4'Left'#3#160
+  +'ck'#7#15'rdgApiTypeClick'#8'TabOrder'#2#2#0#0#9'TGroupBox'#9'Groupbox1'#4'L'
-  +#1#6'Height'#3#160#0#3'Top'#2#8#5'Width'#3#162#0#7'Anchors'#11#5'akTop'#7'ak'
+  +'eft'#3#160#1#6'Height'#3#208#0#3'Top'#2#8#5'Width'#3#162#0#7'Anchors'#11#5
-  +'Right'#0#7'Caption'#6#12'LCL Platform'#11'ParentCtl3D'#8#8'TabOrder'#2#3#0
+  +'akTop'#7'akRight'#0#7'Caption'#6#13'LCL Widgetset'#11'ParentCtl3D'#8#8'TabO'
-  +#12'TRadioButton'#13'rbIndependent'#4'Left'#2#10#6'Height'#2#13#3'Top'#2#3#5
+  +'rder'#2#3#0#12'TRadioButton'#13'rbIndependent'#4'Left'#2#10#6'Height'#2#20#3
-  +'Width'#2'P'#11'AllowGrayed'#9#7'Caption'#6#11'Independent'#7'Checked'#9#7'O'
+  +'Top'#2#3#5'Width'#2'`'#11'AllowGrayed'#9#7'Caption'#6#11'Independent'#7'Che'
-  +'nClick'#7#25'rbPlatformDependencyClick'#5'State'#7#9'cbChecked'#8'TabOrder'
+  +'cked'#9#7'OnClick'#7#25'rbPlatformDependencyClick'#5'State'#7#9'cbChecked'#8
-  +#2#0#0#0#11'TCheckGroup'#14'cbgLCLPlatform'#4'Left'#2#26#6'Height'#2'k'#3'To'
+  +'TabOrder'#2#0#0#0#11'TCheckGroup'#14'cbgLCLPlatform'#4'Left'#2#26#6'Height'
-  +'p'#2#30#5'Width'#3#128#0#8'AutoFill'#9#28'ChildSizing.LeftRightSpacing'#2#6
+  +#3#154#0#3'Top'#2#30#5'Width'#3#128#0#8'AutoFill'#9#28'ChildSizing.LeftRight'
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
+  +'Spacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHor'
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
+  +'izontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
+  +'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
+  +'lds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Lay'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#7'Enabled'
+  +'out'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1
-  +#8#13'Items.Strings'#1#6#5'fpgui'#6#3'gtk'#6#4'gtk2'#6#2'qt'#6#5'win32'#0#8
+  +#7'Enabled'#8#13'Items.Strings'#1#6#6'carbon'#6#5'fpgui'#6#3'gtk'#6#4'gtk2'#6
-  +'TabOrder'#2#2#4'Data'#10#9#0#0#0#5#0#0#0#2#2#2#2#2#0#0#12'TRadioButton'#11
+  +#2'qt'#6#5'win32'#6#5'wince'#0#8'TabOrder'#2#2#4'Data'#10#11#0#0#0#7#0#0#0#2
-  +'rbDependent'#4'Left'#2#10#6'Height'#2#13#3'Top'#2#30#5'Width'#2'I'#11'Allow'
+  +#2#2#2#2#2#2#0#0#12'TRadioButton'#11'rbDependent'#4'Left'#2#10#6'Height'#2#20
-  +'Grayed'#9#7'Caption'#6#9'Dependent'#7'OnClick'#7#25'rbPlatformDependencyCli'
+  +#3'Top'#2#30#5'Width'#2'X'#11'AllowGrayed'#9#7'Caption'#6#9'Dependent'#7'OnC'
-  +'ck'#8'TabOrder'#2#1#0#0#0#5'TMemo'#15'txtDeclarations'#4'Left'#2#4#6'Height'
+  +'lick'#7#25'rbPlatformDependencyClick'#8'TabOrder'#2#1#0#0#0#5'TMemo'#15'txt'
-  +#3'/'#1#3'Top'#2'H'#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
+  +'Declarations'#4'Left'#2#4#6'Height'#3'/'#1#3'Top'#2'H'#5'Width'#3#148#1#7'A'
-  +'ght'#8'akBottom'#0#10'ScrollBars'#7#6'ssBoth'#8'TabOrder'#2#4#8'WordWrap'#8
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#10'ScrollBars'#7#6's'
-  +#0#0#0
+  +'sBoth'#8'TabOrder'#2#4#8'WordWrap'#8#0#0#0
 ]);

tools/apiwizz/apiwizard.pp

@@ -472,7 +472,7 @@ begin
             Add('');
             Add(DeclarationText + ';');
             Add('begin');
-            Add('  ' + PROC_RESULT[ProcType] + 'InterfaceObject.' + ProcName + S + ';');
+            Add('  ' + PROC_RESULT[ProcType] + 'WidgetSet.' + ProcName + S + ';');
             Add('end;');
           end;
         end;