* Many big changes which removes bucket loads of compiler warnins. These will probably break code, but they are easy to fix in your own code.

* All Grid Columns and Rows are now Longword types and not Integer. We mixed them all over the place, even though the grids do not support negative rows or columns.
* Fixed up the UI Designer because of previous change. Same goes for examples.
* Made some changes to get fpGUI compilable under FPC 2.3.1 (latest trunk), but yet no fpGUI application runs yet. No idea why yet.

5 files changed, 21 insertions, 10 deletions

diff --git a/examples/apps/uidesigner/newformdesigner.pas b/examples/apps/uidesigner/newformdesigner.pas
index b39ba067..59f854ba 100644
--- a/examples/apps/uidesigner/newformdesigner.pas
+++ b/examples/apps/uidesigner/newformdesigner.pas
@@ -238,7 +238,8 @@ begin
     Text := 'http://opensoft.homeip.net/fpgui/';
     URL := 'http://opensoft.homeip.net/fpgui/';
     FontDesc := 'Arial-9:underline';
-    HotTrackColor := clRoyalBlue;
+    TextColor := clRoyalBlue;
+    HotTrackColor := clBlue;
     HotTrackFont := 'Arial-9:underline';
   end;
 
diff --git a/examples/apps/uidesigner/vfddesigner.pas b/examples/apps/uidesigner/vfddesigner.pas
index 8e107ddf..1ab14a5d 100644
--- a/examples/apps/uidesigner/vfddesigner.pas
+++ b/examples/apps/uidesigner/vfddesigner.pas
@@ -145,6 +145,10 @@ implementation
 uses
   vfdmain, TypInfo;
 
+type
+  // used to get to SetDesigning() in Form Designer
+  TComponentFriendClass = class(TComponent);
+
 { TWidgetDesigner }
 
 procedure TWidgetDesigner.SetSelected(const AValue: boolean);
@@ -1641,7 +1645,7 @@ begin
   WindowPosition := wpUser;
   WindowTitle := 'New Form';
   SetPosition(300, 150, 300, 250);
-  Include(ComponentState, csDesigning);
+//  TComponentFriendClass(self).SetDesigning(True);
 end;
 
 
diff --git a/examples/apps/uidesigner/vfdfile.pas b/examples/apps/uidesigner/vfdfile.pas
index f01fbf4f..9162d3b0 100644
--- a/examples/apps/uidesigner/vfdfile.pas
+++ b/examples/apps/uidesigner/vfdfile.pas
@@ -86,7 +86,7 @@ begin
     '  public' + LineEnding +
     '    {@VFD_HEAD_BEGIN: ' + formname + '}' + LineEnding +
     formheadblock +
-    '    {@VFD_HEAD_END: ' + formname + '}' + LineEnding + LineEnding +
+    '    {@VFD_HEAD_END: ' + formname + '}' + LineEnding +
     '    procedure AfterCreate; override;' + LineEnding
     + '  end;' + LineEnding + LineEnding;
   NewFormsDecl := NewFormsDecl + s;
diff --git a/examples/apps/uidesigner/vfdpropeditgrid.pas b/examples/apps/uidesigner/vfdpropeditgrid.pas
index 1ded9366..b14cb590 100644
--- a/examples/apps/uidesigner/vfdpropeditgrid.pas
+++ b/examples/apps/uidesigner/vfdpropeditgrid.pas
@@ -55,8 +55,8 @@ type
 
   TColumnsGrid = class(TfpgCustomGrid)
   protected
-    function    GetRowCount: integer; override;
-    procedure   DrawCell(ARow, ACol: integer; ARect: TfpgRect; AFlags: integer);  override;
+    function    GetRowCount: Longword; override;
+    procedure   DrawCell(ARow, ACol: Longword; ARect: TfpgRect; AFlags: integer);  override;
   public
     dbgrid: TfpgStringGrid;
     constructor Create(AOwner: TComponent); override;
@@ -65,7 +65,7 @@ type
 
   TColumnEditForm = class(TfpgForm)
   private
-    procedure GridRowChange(Sender: TObject; row: integer);
+    procedure GridRowChange(Sender: TObject; row: Longword);
     procedure EditChange(Sender: TObject);
     procedure NewButtonClick(Sender: TObject);
     procedure DeleteButtonClick(Sender: TObject);
@@ -283,7 +283,7 @@ begin
   {@VFD_BODY_END: ColumnEditForm}
 end;
 
-procedure TColumnEditForm.GridRowChange(Sender: TObject; row: integer);
+procedure TColumnEditForm.GridRowChange(Sender: TObject; row: Longword);
 var
   i: integer;
   c: TfpgStringColumn;
@@ -376,7 +376,7 @@ end;
 
 { TColumnsGrid }
 
-function TColumnsGrid.GetRowCount: integer;
+function TColumnsGrid.GetRowCount: Longword;
 begin
   try
     Result := dbgrid.ColumnCount;
@@ -385,7 +385,7 @@ begin
   end;
 end;
 
-procedure TColumnsGrid.DrawCell(ARow, ACol: integer; ARect: TfpgRect; AFlags: integer);
+procedure TColumnsGrid.DrawCell(ARow, ACol: Longword; ARect: TfpgRect; AFlags: integer);
 var
   s: string;
   x: integer;
diff --git a/examples/apps/uidesigner/vfdwidgetclass.pas b/examples/apps/uidesigner/vfdwidgetclass.pas
index b1c7eee0..e1b57f50 100644
--- a/examples/apps/uidesigner/vfdwidgetclass.pas
+++ b/examples/apps/uidesigner/vfdwidgetclass.pas
@@ -89,6 +89,12 @@ implementation
 
 uses
   TypInfo;
+  
+
+type
+  // used to get to SetDesigning() in Form Designer
+  TComponentFriendClass = class(TComponent);
+
 
 { TVFDWidgetClass }
 
@@ -112,7 +118,7 @@ end;
 function TVFDWidgetClass.CreateWidget(AOwner: TComponent): TfpgWidget;
 begin
   Result := WidgetClass.Create(AOwner);
-  Include(Result.ComponentState, csDesigning);
+  TComponentFriendClass(Result).SetDesigning(True);
 end;
 
 destructor TVFDWidgetClass.Destroy;