* Fixed a TStyleAbs method name after the classname changes.

* Fixed a minor bug in the CalsSize method of TFixedLayout
* Fixed the WidgetTest demo after the gui class names changed.

11 files changed, 59 insertions, 65 deletions

diff --git a/examples/gui/widgettest/checkboxform.frm b/examples/gui/widgettest/checkboxform.frm
index 3d45576f..6b0ec377 100644
--- a/examples/gui/widgettest/checkboxform.frm
+++ b/examples/gui/widgettest/checkboxform.frm
@@ -3,14 +3,14 @@ object CheckBoxForm: TCheckBoxForm
   Text = 'Check box test'
   object Box: TFBoxLayout
     Orientation = Vertical
-    object GrayCheckBox: TCheckBox
+    object GrayCheckBox: TFCheckBox
       Text = 'Gray other check boxes'
       OnClick = GrayCheckBoxClick
     end
-    object CheckBox1: TCheckBox
+    object CheckBox1: TFCheckBox
       Text = 'First other check box'
     end
-    object CheckBox2: TCheckBox
+    object CheckBox2: TFCheckBox
       Text = 'Second other check box'
     end
   end
diff --git a/examples/gui/widgettest/comboboxform.frm b/examples/gui/widgettest/comboboxform.frm
index f26f79b7..4953eccf 100644
--- a/examples/gui/widgettest/comboboxform.frm
+++ b/examples/gui/widgettest/comboboxform.frm
@@ -4,16 +4,16 @@ object ComboBoxForm: TComboBoxForm
   OnCreate = FormCreate
   object VertBox: TFBoxLayout
     Orientation = Vertical
-    object GrayCheckBox: TCheckBox
+    object GrayCheckBox: TFCheckBox
       Text = 'Gray combo boxes'
       OnClick = GrayCheckBoxClick
     end
     object BetaLabel: TFLabel
       Text = '(the drop-down lists are work in progress)'
     end
-    object ComboBox1: TComboBox
+    object ComboBox1: TFComboBox
     end
-    object ComboBox2: TComboBox
+    object ComboBox2: TFComboBox
     end
   end
 end
diff --git a/examples/gui/widgettest/editform.frm b/examples/gui/widgettest/editform.frm
index 627a81d9..d3c9130c 100644
--- a/examples/gui/widgettest/editform.frm
+++ b/examples/gui/widgettest/editform.frm
@@ -1,7 +1,7 @@
 object EditForm: TEditForm
   BorderWidth = 8
   Text = 'Edit field test'
-  object Grid: TGridLayout
+  object Grid: TFGridLayout
     ColCount = 3
     RowCount = 4
     GridPositions = <
@@ -44,10 +44,10 @@ object EditForm: TEditForm
       Text = 'Normal edit field:'
       CanExpandWidth = False
     end
-    object Edit1: TEdit
+    object Edit1: TFEdit
       Text = 'Edit1'
     end
-    object GrayCheckBox1: TCheckBox
+    object GrayCheckBox1: TFCheckBox
       Text = 'Disabled'
       OnClick = GrayCheckBox1Click
     end
@@ -57,12 +57,12 @@ object EditForm: TEditForm
       Text = 'Password edit field:'
       CanExpandWidth = False
     end
-    object Edit2: TEdit
+    object Edit2: TFEdit
       PasswordChar = '*'
       Text = 'Edit2'
       OnChange = Edit2Change
     end
-    object GrayCheckBox2: TCheckBox
+    object GrayCheckBox2: TFCheckBox
       Text = 'Disabled'
       OnClick = GrayCheckBox2Click
     end
diff --git a/examples/gui/widgettest/gridform.frm b/examples/gui/widgettest/gridform.frm
index 43d673fd..26680064 100644
--- a/examples/gui/widgettest/gridform.frm
+++ b/examples/gui/widgettest/gridform.frm
@@ -2,7 +2,7 @@ object GridForm: TGridForm
   BorderWidth = 8
   Text = 'Grid test'
   OnCreate = FormCreate
-  object StringGrid: TStringGrid
+  object StringGrid: TFStringGrid
     ColCount = 10
     RowCount = 15
   end
diff --git a/examples/gui/widgettest/groupboxform.frm b/examples/gui/widgettest/groupboxform.frm
index 73334564..e3b7111e 100644
--- a/examples/gui/widgettest/groupboxform.frm
+++ b/examples/gui/widgettest/groupboxform.frm
@@ -3,11 +3,11 @@ object GroupBoxForm: TGroupBoxForm
   Text = 'Group box test'
   object HorzBox: TFBoxLayout
     VertAlign = vertTop
-    object GroupBox1: TGroupBox
+    object GroupBox1: TFGroupBox
       Text = 'Group box #1'
       object VertBox1: TFBoxLayout
         Orientation = Vertical
-        object GrayCheckBox: TCheckBox
+        object GrayCheckBox: TFCheckBox
           Text = 'Gray other group box'
 	  OnClick = GrayCheckBoxClick
         end
@@ -18,28 +18,28 @@ object GroupBoxForm: TGroupBoxForm
 	end
       end
     end
-    object GroupBox2: TGroupBox
+    object GroupBox2: TFGroupBox
       Text = 'Group box #2'
       object VertBox2: TFBoxLayout
         Orientation = Vertical
-	object Radio1: TRadioButton
+	object Radio1: TFRadioButton
 	  Checked = True
 	  Text = 'Option 1'
 	  OnClick = RadioButtonClick
 	end
-	object Radio2: TRadioButton
+	object Radio2: TFRadioButton
 	  Text = 'Option 2'
 	  OnClick = RadioButtonClick
 	end
-	object Radio3: TRadioButton
+	object Radio3: TFRadioButton
 	  Text = 'Option 3'
 	  OnClick = RadioButtonClick
 	end
-	object Radio4: TRadioButton
+	object Radio4: TFRadioButton
 	  Text = 'Option 4'
 	  OnClick = RadioButtonClick
 	end
-	object Radio5: TRadioButton
+	object Radio5: TFRadioButton
 	  Text = 'Option 5'
 	  OnClick = RadioButtonClick
 	end
diff --git a/examples/gui/widgettest/listboxform.frm b/examples/gui/widgettest/listboxform.frm
index 7d7c4f4c..2071b122 100644
--- a/examples/gui/widgettest/listboxform.frm
+++ b/examples/gui/widgettest/listboxform.frm
@@ -1,7 +1,7 @@
 object ListBoxForm: TListBoxForm
   BorderWidth = 8
   Text = 'List box test'
-  object ListBox: TListBox
+  object ListBox: TFListBox
     Items.Strings = (
       'procedure KeyPressed(var Event: TXKeyPressedEvent); message X.KeyPress;'
       'procedure KeyReleased(var Event: TXKeyReleasedEvent); message X.KeyRelease;'
diff --git a/examples/gui/widgettest/radiobuttonform.frm b/examples/gui/widgettest/radiobuttonform.frm
index 018f8c4e..97e338c3 100644
--- a/examples/gui/widgettest/radiobuttonform.frm
+++ b/examples/gui/widgettest/radiobuttonform.frm
@@ -3,27 +3,27 @@ object RadioButtonForm: TRadioButtonForm
   Text = 'Radio button test'
   object Box: TFBoxLayout
     Orientation = Vertical
-    object GrayCheckbox: TCheckbox
+    object GrayCheckbox: TFCheckbox
       Text = 'Gray radio buttons'
       OnClick = GrayCheckboxClick
     end
     object HorzBox: TFBoxLayout
       object ButtonBox1: TFBoxLayout
         Orientation = Vertical
-        object Radio1a: TRadioButton
+        object Radio1a: TFRadioButton
 	        Checked = True
           Text = 'Button 1 a'
         end
-        object Radio1b: TRadioButton
+        object Radio1b: TFRadioButton
           Text = 'Button 1 b'
         end
       end
       object ButtonBox2: TFBoxLayout
         Orientation = Vertical
-        object Radio2a: TRadioButton
+        object Radio2a: TFRadioButton
           Text = 'Button 2 a'
         end
-        object Radio2b: TRadioButton
+        object Radio2b: TFRadioButton
 	        Checked = True
           Text = 'Button 2 b'
         end
diff --git a/examples/gui/widgettest/scrollbarform.frm b/examples/gui/widgettest/scrollbarform.frm
index be61a217..bc820b77 100644
--- a/examples/gui/widgettest/scrollbarform.frm
+++ b/examples/gui/widgettest/scrollbarform.frm
@@ -3,12 +3,12 @@ object ScrollBarForm: TScrollBarForm
   Text = 'Scroll bar test'
   object VertBox: TFBoxLayout
     Orientation = Vertical
-    object GrayCheckBox: TCheckBox
+    object GrayCheckBox: TFCheckBox
       Text = 'Gray everything'
       OnClick = GrayCheckBoxClick
     end
     object HorzBox: TFBoxLayout
-      object HorzGrid: TGridLayout
+      object HorzGrid: TFGridLayout
         ColCount = 3
         RowCount = 6
         ColSpacing = 8
@@ -95,7 +95,7 @@ object ScrollBarForm: TScrollBarForm
 	  Alignment = taRightJustify
           Text = '0..1, PageSize=0:'
         end
-        object ScrollBar1: TScrollBar
+        object ScrollBar1: TFScrollBar
           Min = 0
           Max = 1
 	  OnChange = ScrollBar1Change
@@ -108,7 +108,7 @@ object ScrollBarForm: TScrollBarForm
 	  Alignment = taRightJustify
           Text = '0..1, PageSize=1:'
         end
-        object ScrollBar2: TScrollBar
+        object ScrollBar2: TFScrollBar
           Max = 1
           PageSize = 1
 	  OnChange = ScrollBar2Change
@@ -121,7 +121,7 @@ object ScrollBarForm: TScrollBarForm
 	  Alignment = taRightJustify
           Text = '-2..3, PageSize=0:'
         end
-        object ScrollBar3: TScrollBar
+        object ScrollBar3: TFScrollBar
           Min = -2
           Max = 3
 	  OnChange = ScrollBar3Change
@@ -134,7 +134,7 @@ object ScrollBarForm: TScrollBarForm
 	  Alignment = taRightJustify
           Text = '-5..9, PageSize=4:'
         end
-        object ScrollBar4: TScrollBar
+        object ScrollBar4: TFScrollBar
           Min = -5
           Max = 9
           PageSize = 4
@@ -148,7 +148,7 @@ object ScrollBarForm: TScrollBarForm
 	  Alignment = taRightJustify
           Text = '-100..200, PageSize=7:'
         end
-        object ScrollBar5: TScrollBar
+        object ScrollBar5: TFScrollBar
           Min = -100
           Max = 200
           PageSize = 7
@@ -165,7 +165,7 @@ object ScrollBarForm: TScrollBarForm
       object VerTFLabel: TFLabel
         Text = 'Vertical:'
       end
-      object VertScrollBar: TScrollBar
+      object VertScrollBar: TFScrollBar
         Orientation = Vertical
         Min = -2
 	Max = 3
diff --git a/examples/gui/widgettest/scrollboxform.frm b/examples/gui/widgettest/scrollboxform.frm
index 8bb79b34..b83d47a1 100644
--- a/examples/gui/widgettest/scrollboxform.frm
+++ b/examples/gui/widgettest/scrollboxform.frm
@@ -8,7 +8,7 @@ object ScrollBoxForm: TScrollBoxForm
       CanExpandWidth = True

       Text = 'ScrollBox should be transparent in this demo.'

     end

-    object ScrollBox: TScrollBox

+    object ScrollBox: TFScrollBox

     end

   end

 end

diff --git a/examples/gui/widgettest/widgettest.lpi b/examples/gui/widgettest/widgettest.lpi
index 80296df0..be425d5c 100644
--- a/examples/gui/widgettest/widgettest.lpi
+++ b/examples/gui/widgettest/widgettest.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="5"/>
     <General>
       <Flags>
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <IconPath Value=".\"/>
+      <IconPath Value="./"/>
       <TargetFileExt Value=""/>
     </General>
     <PublishOptions>
@@ -20,7 +20,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="1">
@@ -39,18 +39,12 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
-    <PathDelim Value="\"/>
     <Parsing>
       <SyntaxOptions>
         <IncludeAssertionCode Value="True"/>
         <AllowLabel Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-      <TargetCPU Value="i386"/>
-      <TargetOS Value="Win32"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits -dTraceEventsX -dDebugX
 "/>
diff --git a/examples/gui/widgettest/widgettest.pas b/examples/gui/widgettest/widgettest.pas
index 0846d44f..a7a3dd93 100644
--- a/examples/gui/widgettest/widgettest.pas
+++ b/examples/gui/widgettest/widgettest.pas
@@ -10,7 +10,7 @@ uses
 type
 
   // forward declarations
-  TFCheckboxForm       = class;
+  TCheckboxForm       = class;
   TRadioButtonForm    = class;
   TGroupBoxForm       = class;
   TEditForm           = class;
@@ -27,7 +27,7 @@ type
 
   TMainForm = class(TFForm)
   private
-    _frmCheckBox: TFCheckboxForm;
+    _frmCheckBox: TCheckboxForm;
     _frmRadioButton: TRadioButtonForm;
     _frmGroupBox: TGroupBoxForm;
     _frmEdit: TEditForm;
@@ -79,7 +79,7 @@ type
   end;
 
 
-  TFCheckboxForm = class(TTestForm)
+  TCheckboxForm = class(TTestForm)
     Box: TFBoxLayout;
     GrayCheckBox, CheckBox1, CheckBox2: TFCheckbox;
     procedure GrayCheckBoxClick(Sender: TObject);
@@ -91,7 +91,7 @@ type
   TRadioButtonForm = class(TTestForm)
     Box, HorzBox, ButtonBox1, ButtonBox2: TFBoxLayout;
     GrayCheckBox: TFCheckbox;
-    Radio1a, Radio1b, Radio2a, Radio2b: TRadioButton;
+    Radio1a, Radio1b, Radio2a, Radio2b: TFRadioButton;
     procedure GrayCheckBoxClick(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -103,7 +103,7 @@ type
     GroupBox1, GroupBox2: TFGroupBox;
     GrayCheckBox: TFCheckbox;
     Button: TFButton;
-    Radio1, Radio2, Radio3, Radio4, Radio5: TRadioButton;
+    Radio1, Radio2, Radio3, Radio4, Radio5: TFRadioButton;
     procedure GrayCheckBoxClick(Sender: TObject);
     procedure ButtonClick(Sender: TObject);
     procedure RadioButtonClick(Sender: TObject);
@@ -212,7 +212,7 @@ type
   published
     MainLayout: TFBoxLayout;
     StyleGroup: TFGroupBox;
-    rbPlain, rbLowered, rbRaised: TRadioButton;
+    rbPlain, rbLowered, rbRaised: TFRadioButton;
     VBox1: TFBoxLayout;
     Panel: TFPanel;
     Separator: TSeparator;
@@ -233,9 +233,9 @@ type
     PB: TFProgressBar;
     cbShowPercent: TFCheckbox;
     gbColor: TFGroupBox;
-    rbBlue: TRadioButton;
-    rbRed: TRadioButton;
-    rbGreen: TRadioButton;
+    rbBlue: TFRadioButton;
+    rbRed: TFRadioButton;
+    rbGreen: TFRadioButton;
     Separator: TSeparator;
     btnRandom: TFButton;
   end;
@@ -311,7 +311,7 @@ end;
 
 procedure TPanelForm.RadioButtonClick(Sender: TObject);
 begin
-  case TRadioButton(Sender).Tag of
+  case TFRadioButton(Sender).Tag of
     1: Panel.BevelStyle := bsPlain;
     2: Panel.BevelStyle := bsLowered;
     3: Panel.BevelStyle := bsRaised;
@@ -336,13 +336,13 @@ begin
   VBox1.Orientation := Vertical;
   StyleGroup.InsertChild(VBox1);
   
-  rbPlain := TRadioButton.Create('Plain', self);
+  rbPlain := TFRadioButton.Create('Plain', self);
   rbPlain.Tag := 1;
   rbPlain.OnClick := @RadioButtonClick;
-  rbLowered := TRadioButton.Create('Lowered', self);
+  rbLowered := TFRadioButton.Create('Lowered', self);
   rbLowered.Tag := 2;
   rbLowered.OnClick := @RadioButtonClick;
-  rbRaised := TRadioButton.Create('Raised', self);
+  rbRaised := TFRadioButton.Create('Raised', self);
   rbRaised.Tag := 3;
   rbRaised.OnClick := @RadioButtonClick;
   rbRaised.Checked := True;
@@ -374,7 +374,7 @@ end;
 
 procedure TProgressBarForm.RadioButtonClick(Sender: TObject);
 begin
-  case TRadioButton(Sender).Tag of
+  case TFRadioButton(Sender).Tag of
     1: PB.FillColor := clRed;
     2: PB.FillColor := clGreen;
     3: PB.FillColor := clBlue;
@@ -400,16 +400,16 @@ begin
   VBox.Orientation := Vertical;
   
   gbColor   := TFGroupBox.Create('Fill Color', self);
-  rbRed           := TRadioButton.Create('Red', self);
+  rbRed           := TFRadioButton.Create('Red', self);
   rbRed.Tag       := 1;
   rbRed.OnClick   := @RadioButtonClick;
   rbRed.Checked   := True;
 
-  rbGreen         := TRadioButton.Create('Green', self);
+  rbGreen         := TFRadioButton.Create('Green', self);
   rbGreen.Tag     := 2;
   rbGreen.OnClick := @RadioButtonClick;
 
-  rbBlue          := TRadioButton.Create('Blue', self);
+  rbBlue          := TFRadioButton.Create('Blue', self);
   rbBlue.Tag      := 3;
   rbBlue.OnClick  := @RadioButtonClick;
 
@@ -476,7 +476,7 @@ end;
 procedure TMainForm.CheckBoxBtnClick(Sender: TObject);
 begin
   if not Assigned(_frmCheckBox) then
-    _frmCheckBox := TFCheckboxForm.Create(self);
+    _frmCheckBox := TCheckboxForm.Create(self);
   _frmCheckBox.Show;
 end;
 
@@ -577,16 +577,16 @@ end;
 
 
 // -------------------------------------------------------------------
-//   TFCheckboxForm
+//   TCheckboxForm
 // -------------------------------------------------------------------
 
-procedure TFCheckboxForm.GrayCheckBoxClick(Sender: TObject);
+procedure TCheckboxForm.GrayCheckBoxClick(Sender: TObject);
 begin
   CheckBox1.Enabled := not GrayCheckBox.Checked;
   CheckBox2.Enabled := not GrayCheckBox.Checked;
 end;
 
-constructor TFCheckboxForm.Create(AOwner: TComponent);
+constructor TCheckboxForm.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
   LoadForm(self);