diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index 87b46e0451..d37a362241 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -852,16 +852,19 @@ type
     procedure Arc(x,y,width,height,SX,SY,EX,EY: Integer); virtual;
     Procedure BrushCopy(Dest: TRect; InternalImages: TBitmap; Src: TRect;
                         TransparentColor: TColor); virtual;
-    procedure Chord(x, y, width, height, angle1, angle2: Integer); virtual;
-    procedure Chord(x, y, width, height, SX, SY, EX, EY: Integer); virtual;
-    Procedure CopyRect(const Dest: TRect; SrcCanvas: TCanvas; const Source: TRect); virtual;
+    procedure Chord(x, y, Width, Height,
+                    StartAngle16Deg, EndAngle16Deg: Integer); virtual;
+    procedure Chord(x, y, Width, Height, SX, SY, EX, EY: Integer); virtual;
+    Procedure CopyRect(const Dest: TRect; SrcCanvas: TCanvas;
+                       const Source: TRect); virtual;
     Procedure Draw(X,Y: Integer; SrcGraphic: TGraphic); virtual;
     procedure StretchDraw(const DestRect: TRect; SrcGraphic: TGraphic); virtual;
     procedure Ellipse(const ARect: TRect);
     procedure Ellipse(x1, y1, x2, y2: Integer); virtual;
     Procedure FillRect(const ARect: TRect); virtual;
     Procedure FillRect(X1,Y1,X2,Y2: Integer);
-    procedure FloodFill(X, Y: Integer; FillColor: TColor; FillStyle: TFillStyle); virtual;
+    procedure FloodFill(X, Y: Integer; FillColor: TColor;
+                        FillStyle: TFillStyle); virtual;
     procedure Frame3d(var ARect: TRect; const FrameWidth: integer;
                       const Style: TGraphicsBevelCut); virtual;
     procedure Frame(const ARect: TRect); virtual; // border using pen
@@ -871,8 +874,9 @@ type
     Procedure Line(X1,Y1,X2,Y2: Integer); virtual; // short for MoveTo();LineTo();
     Procedure LineTo(X1,Y1: Integer); virtual;
     Procedure MoveTo(X1,Y1: Integer); virtual;
-    procedure RadialPie(x,y,width,height,angle1,angle2: Integer); virtual;
-    procedure RadialPie(x,y,width,height,sx,sy,ex,ey: Integer); virtual;
+    procedure RadialPie(x,y,Width, Height,
+                        StartAngle16Deg, EndAngle16Deg: Integer); virtual;
+    procedure RadialPie(x,y,Width,Height,sx,sy,ex,ey: Integer); virtual;
     procedure Pie(EllipseX1,EllipseY1,EllipseX2,EllipseY2,
                   StartX,StartY,EndX,EndY: Integer); virtual;
     procedure PolyBezier(Points: PPoint; NumPts: Integer;
@@ -1774,6 +1778,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.156  2004/09/29 15:18:26  mattias
+  fixed TBitmap.Canvas.Frame3d
+
   Revision 1.155  2004/09/27 10:01:18  mattias
   added TLazIntfImage.TColors property
 
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index dacea97c90..3f28c25796 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -309,21 +309,24 @@ end;
 
 {------------------------------------------------------------------------------
   Method:   TCanvas.RadialPie
-  Params:   x,y,width,height,angle1,angle2
+  Params:   x,y,Width, Height, StartAngle16Deg, EndAngle16Deg: Integer
   Returns:  Nothing
 
   Use Pie to draw a filled pie-shaped wedge on the canvas.
-  The angles angle1 and angle2 are 1/16th of a degree. For example, a full
-  circle equals 5760 (16*360). Positive values of Angle and AngleLength mean
+  The angles StartAngle16Deg and EndAngle16Deg are 1/16th of a degree.
+  For example, a full circle equals 5760 (16*360).
+  Positive values of Angle and AngleLength mean
   counter-clockwise while negative values mean clockwise direction.
   Zero degrees is at the 3'o clock position.
 
  ------------------------------------------------------------------------------}
-procedure TCanvas.RadialPie(x,y,width,height,angle1,angle2 : Integer);
+procedure TCanvas.RadialPie(x,y,Width, Height,
+  StartAngle16Deg, EndAngle16Deg: Integer);
 begin
   Changing;
   RequiredState([csHandleValid, csBrushValid, csPenValid]);
-  LCLIntf.RadialPieWithAngles(FHandle,x,y,width,height,angle1,angle2);
+  LCLIntf.RadialPieWithAngles(FHandle,x,y,Width,Height,
+                              StartAngle16Deg,EndAngle16Deg);
   Changed;
 end;
 
@@ -1007,7 +1010,7 @@ end;
 
 {------------------------------------------------------------------------------
   Method:   TCanvas.Chord
-  Params:   x,y,width,height,angle1,angle2
+  Params:   x,y,Width, Height, StartAngle16Deg, EndAngle16Deg
   Returns:  Nothing
 
   Use Chord to draw a filled Chord-shape on the canvas. The angles angle1 and
@@ -1016,11 +1019,12 @@ end;
   values mean clockwise direction. Zero degrees is at the 3'o clock position.
 
 ------------------------------------------------------------------------------}
-procedure TCanvas.Chord(x,y,width,height,angle1,angle2 : Integer);
+procedure TCanvas.Chord(x, y, Width, Height,
+  StartAngle16Deg, EndAngle16Deg: Integer);
 begin
   Changing;
   RequiredState([csHandleValid, csBrushValid, csPenValid]);
-  LCLIntf.AngleChord(FHandle,x,y,width,height,angle1,angle2);
+  LCLIntf.AngleChord(FHandle,x,y,Width,Height,StartAngle16Deg,EndAngle16Deg);
   Changed;
 end;
 
@@ -1260,6 +1264,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.82  2004/09/29 15:18:27  mattias
+  fixed TBitmap.Canvas.Frame3d
+
   Revision 1.81  2004/09/24 13:45:32  mattias
   fixed TCanvas.TextRect Delphi compatible Rect and added TBarChart from Michael VC
 
diff --git a/lcl/interfaces/gtk/gtkwinapi.inc b/lcl/interfaces/gtk/gtkwinapi.inc
index a9752818a4..6b008a38ec 100644
--- a/lcl/interfaces/gtk/gtkwinapi.inc
+++ b/lcl/interfaces/gtk/gtkwinapi.inc
@@ -3444,9 +3444,12 @@ begin
       exit;
     end;
     Widget:=PGtkWidget(TDeviceContext(DC).Wnd);
-    ClientWidget:=GetFixedWidget(Widget);
-    if ClientWidget=nil then
-      ClientWidget:=Widget;
+    ClientWidget:=Widget;
+    if Widget<>nil then begin
+      ClientWidget:=GetFixedWidget(Widget);
+      if ClientWidget=nil then
+        ClientWidget:=Widget;
+    end;
     AWindow:=Drawable;
     DCOrigin:=GetDCOffset(TDeviceContext(DC));
     Area.X:=ARect.Left+DCOrigin.X;
@@ -8687,6 +8690,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.368  2004/09/29 15:18:27  mattias
+  fixed TBitmap.Canvas.Frame3d
+
   Revision 1.367  2004/09/17 20:30:13  vincents
   replaced write by DbgOut
 
diff --git a/lcl/interfaces/gtk2/gtk2interface.pas b/lcl/interfaces/gtk2/gtk2interface.pas
index 2aa76bf611..c99b70e80a 100644
--- a/lcl/interfaces/gtk2/gtk2interface.pas
+++ b/lcl/interfaces/gtk2/gtk2interface.pas
@@ -1,7 +1,7 @@
-{ This file was automatically created by Lazarus. Do not edit!
+{  This file was automatically created by Lazarus. Do not edit!
   This source is only used to compile and install
   the package GTK2Interface 0.0.
-}
+ }
 
 unit GTK2Interface; 
 
@@ -18,5 +18,5 @@ begin
 end; 
 
 initialization
-  RegisterPackage('GTK2Interface', @Register)
+  RegisterPackage('GTK2Interface', @Register); 
 end.