diff --git a/designer/designer.pp b/designer/designer.pp
index a64d3de0f9..89947f5f69 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -112,7 +112,7 @@ type
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure PaintGrid; override;
     procedure ValidateRename(AComponent: TComponent;
-       const CurName, NewName: shortstring); override;
+       const CurName, NewName: string); override;
     Procedure SelectOnlyThisComponent(AComponent:TComponent);
 
     property IsControl: Boolean read GetIsControl write SetIsControl;
@@ -799,9 +799,9 @@ begin
 end;
 
 procedure TDesigner.ValidateRename(AComponent: TComponent;
-  const CurName, NewName: shortstring);
+  const CurName, NewName: string);
 Begin
-
+  writeln('ToDo: TDesigner.ValidateRename ',CurName,', ',NewName);
 end;
 
 function TDesigner.GetIsControl: Boolean;
diff --git a/ide/ideprocs.pp b/ide/ideprocs.pp
index 0a1cd2b0eb..6f3861aa67 100644
--- a/ide/ideprocs.pp
+++ b/ide/ideprocs.pp
@@ -44,15 +44,16 @@ procedure AddToRecentList(const s: string; RecentList: TStringList;
 implementation
 
 // to get more detailed error messages consider the os
- {$IFDEF Linux}
+{$IFDEF Win32}
+{$ELSE}
 uses
  {$IFDEF Ver1_0}
   Linux
  {$ELSE}
   Unix
  {$ENDIF}
- ;
- {$ENDIF}
+  ;
+{$ENDIF}
 
 procedure AddToRecentList(const s: string; RecentList: TStringList;
   Max: integer);
@@ -134,7 +135,7 @@ begin
   if not FileExists(AFilename) then begin
     raise Exception.Create('file "'+AFilename+'" does not exist');
   end;
-  {$IFDEF linux}
+  {$IFNDEF win32}
   if not{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.Access(
     AFilename,{$IFDEF Ver1_0}Linux{$ELSE}Unix{$ENDIF}.X_OK) then
   begin
@@ -151,7 +152,7 @@ begin
     end;
     raise Exception.Create(AText);
   end;
-  {$ENDIF linux}
+  {$ENDIF}
   
   // ToDo: windows and xxxbsd
 end;
diff --git a/lcl/forms.pp b/lcl/forms.pp
index f9350159b0..3104fa00a7 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -132,7 +132,7 @@ type
     Procedure RequestAlign; Override;
     procedure UpdateShowing; override;
     procedure UpdateWindowState;
-    procedure ValidateRename(AComponent: TComponent; const CurName, NewName: shortstring);
+    procedure ValidateRename(AComponent: TComponent; const CurName, NewName: string);override;
     procedure WndProc(var Message : TLMessage); override;
     {events}
     property ActiveControl : TWinControl read FActiveControl write SetActiveControl;
@@ -320,7 +320,7 @@ type
       Operation: TOperation); virtual; abstract;
     procedure PaintGrid; virtual; abstract;
     procedure ValidateRename(AComponent: TComponent;
-      const CurName, NewName: shortstring); virtual; abstract;
+      const CurName, NewName: string); virtual; abstract;
     end;
 
 
diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc
index ec1ee5371c..94ac2f1060 100644
--- a/lcl/include/customform.inc
+++ b/lcl/include/customform.inc
@@ -454,7 +454,7 @@ end;
 {       TCustomForm ValidateRename                                          }
 {------------------------------------------------------------------------------}
 procedure TCustomForm.ValidateRename(AComponent: TComponent;
-  const CurName, NewName: ShortString);
+  const CurName, NewName: String);
 begin
   inherited ValidateRename(AComponent, CurName, NewName);
   if FDesigner <> nil then
@@ -949,6 +949,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.31  2001/12/19 10:59:12  lazarus
+  MG: changes for fpc 1.1
+
   Revision 1.30  2001/11/10 10:48:00  lazarus
   MG: fixed set formicon on invisible forms
 
diff --git a/lcl/include/hintwindow.inc b/lcl/include/hintwindow.inc
index f097ab84b6..e783a278fd 100644
--- a/lcl/include/hintwindow.inc
+++ b/lcl/include/hintwindow.inc
@@ -1,3 +1,5 @@
+// included by forms.pp
+
 { THintWindow }
 {
 
@@ -9,6 +11,7 @@
 }
 
 constructor THintWindow.Create(AOwner: TComponent);
+var TheTimer: TTimer;
 begin
   inherited Create(AOwner);
   fCompStyle := csHintWindow;
@@ -18,10 +21,11 @@ begin
   Caption := 'THintWIndow';
   SetBounds(1,1,25,25);
   FHideInterval := 3000;
-  FAutoHideTimer := TTimer.Create(self);
-  TTimer(FAutoHideTImer).Interval := HideInterval;
-  TTimer(FAutoHideTimer).Enabled := False;
-  TTimer(FAutoHideTimer).OnTimer := @AutoHideHint;
+  TheTimer := TTimer.Create(self);
+  FAutoHideTimer := TheTimer;
+  TheTimer.Interval := HideInterval;
+  TheTimer.Enabled := False;
+  TheTimer.OnTimer := @AutoHideHint;
 end;
 
 destructor THintWIndow.Destroy;