Merge branch 'lkppo' into fixes_1.4

19 files changed, 10 insertions, 44 deletions

diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas
index 9177e420..32b64394 100644
--- a/src/corelib/fpg_base.pas
+++ b/src/corelib/fpg_base.pas
@@ -2273,12 +2273,11 @@ procedure TfpgImageBase.CreateMaskFromSample(x, y: TfpgCoord);
 var
   p: ^longword;
   pmsk: ^byte;
-  c, n: longword;
+  c: longword;
   linecnt: integer;
   pixelcnt: integer;
   bit: byte;
   msklinelen: integer;
-  row, col: integer;
 begin
   if FColorDepth = 1 then
     Exit; //==>
diff --git a/src/corelib/render/software/Agg2D.pas b/src/corelib/render/software/Agg2D.pas
index b77b9ce9..7cf9cb48 100644
--- a/src/corelib/render/software/Agg2D.pas
+++ b/src/corelib/render/software/Agg2D.pas
@@ -644,7 +644,7 @@ type
  function  BitmapAlphaTransparency(bitmap : TfpgImage; alpha : byte ) : boolean;
 
  function  fpgColor2AggColor(c: TfpgColor): TAggColor;
- 
+
 
 IMPLEMENTATION
 
@@ -995,7 +995,6 @@ end;
 function fpgColor2AggColor(c: TfpgColor): TAggColor;
 var
   t: TRGBTriple;
-  c1: TfpgColor;
 begin
   t := fpgColorToRGBTriple(c);
   Result.Construct(t.Red, t.Green, t.Blue, t.Alpha);
@@ -1137,7 +1136,7 @@ begin
       stride );
 
     { OK }
-     result:=true; 
+     result:=true;
 
     end;
 
@@ -3569,7 +3568,6 @@ end;
 {$ENDIF}
 {$IFDEF UNIX}
 var
-  s: TfpgString;
   i: integer;
   fnt: TFontCacheItem;
   lSize: double;
@@ -3841,4 +3839,4 @@ end;
 
 end.
 
- 
+
diff --git a/src/corelib/render/software/agg_color.pas b/src/corelib/render/software/agg_color.pas
index 3aadb4f4..05958f8d 100644
--- a/src/corelib/render/software/agg_color.pas
+++ b/src/corelib/render/software/agg_color.pas
@@ -244,13 +244,12 @@ end;
 { FROM_WAVELENGTH }
 constructor aggclr.from_wavelength(wl ,gamma : double );
 var
- tr ,tg ,tb ,ta ,s : double;
+ tr ,tg ,tb ,s : double;
 
 begin
  tr:=0;
  tg:=0;
  tb:=0;
- ta:=0;
 
  if (wl >= 380.0 ) and
     (wl <= 440.0 ) then
diff --git a/src/corelib/render/software/agg_scanline_storage_aa.pas b/src/corelib/render/software/agg_scanline_storage_aa.pas
index 1f1f4ab4..b625f097 100644
--- a/src/corelib/render/software/agg_scanline_storage_aa.pas
+++ b/src/corelib/render/software/agg_scanline_storage_aa.pas
@@ -1671,9 +1671,6 @@ end;
 
 { REWIND_SCANLINES }
 function serialized_scanlines_adaptor_aa.rewind_scanlines;
-var
- x : int;
-
 begin
  m_ptr:=m_data;
 
diff --git a/src/corelib/render/software/fpg_fontcache.pas b/src/corelib/render/software/fpg_fontcache.pas
index 15f65e40..3de3a7f6 100644
--- a/src/corelib/render/software/fpg_fontcache.pas
+++ b/src/corelib/render/software/fpg_fontcache.pas
@@ -207,7 +207,6 @@ function TFontCacheList.BuildFontCacheItem(const AFontFile: TfpgString): TFontCa
 var
   face_ptr: FT_Face_ptr;
   s: Ansistring;
-  i: integer;
   flags: integer;
 begin
   FT_New_Face(m_library, PChar(AFontFile), 0, face_ptr);
diff --git a/src/corelib/x11/fpg_netlayer_x11.pas b/src/corelib/x11/fpg_netlayer_x11.pas
index eb9207b0..0ba60a6b 100644
--- a/src/corelib/x11/fpg_netlayer_x11.pas
+++ b/src/corelib/x11/fpg_netlayer_x11.pas
@@ -601,8 +601,6 @@ begin
 end;
 
 procedure TNETWindowLayer.WindowSetSupportPING(const AWindow: TWindow);
-var
-  WM_PROTOCOLS: TAtom;
 begin
   //WM_PROTOCOLS := XInternAtom(FDisplay, 'WM_PROTOCOLS', True);
   WindowAddProtocol(AWindow, FNetAtoms[naWM_PING]);
diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas
index ff6e7272..f614bda1 100644
--- a/src/corelib/x11/fpg_x11.pas
+++ b/src/corelib/x11/fpg_x11.pas
@@ -704,7 +704,6 @@ var
   Data: Pointer;
   xia_Atom_Pair: TAtom;
   AtomPair: TAtomPair;
-  i: Integer;
   r: cint;
 begin
 
diff --git a/src/gui/fpg_basegrid.pas b/src/gui/fpg_basegrid.pas
index 2df7b414..0524adac 100644
--- a/src/gui/fpg_basegrid.pas
+++ b/src/gui/fpg_basegrid.pas
@@ -696,7 +696,6 @@ var
   cw: integer;
   vl: integer;
   i: integer;
-  x: integer;
   hmax: integer;
   vmax: integer;
   Hfits, showH : boolean;
@@ -929,7 +928,6 @@ var
   rTop: integer;
   firstcol, lastcol, firstrow, lastrow : integer;
   cWidths: array of integer;
-  rect: TRect;
 begin
   Canvas.ClearClipRect;
   r.SetRect(0, 0, Width, Height);
@@ -1446,7 +1444,6 @@ end;
 
 procedure TfpgBaseGrid.HandleLMouseUp(x, y: integer; shiftstate: TShiftState);
 var
-  lColumn: integer;
   hh: integer; { header height }
   cLeft: integer; { column left }
   c: integer;
@@ -1512,7 +1509,6 @@ var
   hh: integer;
   n: Integer;
   cw: integer;
-  nw: integer;
   prow: Integer;
   pcol: Integer;
   c: integer;
diff --git a/src/gui/fpg_checkbox.pas b/src/gui/fpg_checkbox.pas
index a2946c3c..d428ad55 100644
--- a/src/gui/fpg_checkbox.pas
+++ b/src/gui/fpg_checkbox.pas
@@ -189,7 +189,6 @@ procedure TfpgBaseCheckBox.HandlePaint;
 var
   r: TfpgRect;
   ix: integer;
-  img: TfpgImage;
   LFlags: TfpgTextFlags;
 begin
   inherited HandlePaint;
diff --git a/src/gui/fpg_dialogs.pas b/src/gui/fpg_dialogs.pas
index 08d47eb0..2253a770 100644
--- a/src/gui/fpg_dialogs.pas
+++ b/src/gui/fpg_dialogs.pas
@@ -1469,7 +1469,6 @@ end;
 function TfpgFileDialog.CreatePopupMenu: TfpgPopupMenu;
 var
   i: integer;
-  s: TfpgString;
   lst: TStringList;
   mi: TfpgMenuItem;
 begin
diff --git a/src/gui/fpg_editcombo.pas b/src/gui/fpg_editcombo.pas
index 12773d9b..a8bd30ed 100644
--- a/src/gui/fpg_editcombo.pas
+++ b/src/gui/fpg_editcombo.pas
@@ -441,9 +441,9 @@ begin
 end;
 
 procedure TfpgBaseEditCombo.SetDefaultPopupMenuItemsState;
-var
-  i: integer;
-  itm: TfpgMenuItem;
+//var
+  //i: integer;
+  //itm: TfpgMenuItem;
 begin
   //for i := 0 to FDefaultPopupMenu.ComponentCount-1 do
   //begin
diff --git a/src/gui/fpg_memo.pas b/src/gui/fpg_memo.pas
index d02e6ec4..7ec6163c 100644
--- a/src/gui/fpg_memo.pas
+++ b/src/gui/fpg_memo.pas
@@ -1706,7 +1706,6 @@ end;
 procedure TfpgMemo.SetText(const AValue: TfpgString);
 var
   n: integer;
-  c: TfpgChar;
   s: TfpgString;
 begin
   FLines.Clear;
diff --git a/src/gui/fpg_menu.pas b/src/gui/fpg_menu.pas
index 4779fe40..f1966759 100644
--- a/src/gui/fpg_menu.pas
+++ b/src/gui/fpg_menu.pas
@@ -1070,7 +1070,6 @@ procedure TfpgPopupMenu.DrawItem(mi: TfpgMenuItem; rect: TfpgRect; AFlags: TfpgM
 var
   s: string;
   x: integer;
-  img: TfpgImage;
   lFlags: TfpgMenuItemFlags;
 begin
   lFlags := AFlags;
diff --git a/src/gui/fpg_scrollbar.pas b/src/gui/fpg_scrollbar.pas
index fbe20006..69a85097 100644
--- a/src/gui/fpg_scrollbar.pas
+++ b/src/gui/fpg_scrollbar.pas
@@ -434,8 +434,6 @@ begin
 end;
 
 procedure TfpgScrollBar.HandleLMouseDown(x, y: integer; shiftstate: TShiftState);
-var
-  lPos: TfpgCoord;
 begin
   inherited;
   CaptureMouse;
diff --git a/src/gui/fpg_scrollframe.pas b/src/gui/fpg_scrollframe.pas
index 008832ce..2355929e 100644
--- a/src/gui/fpg_scrollframe.pas
+++ b/src/gui/fpg_scrollframe.pas
@@ -161,7 +161,6 @@ var
   c : TComponent;
   max_w, max_h : integer;
   this_need : integer;
-  par : TfpgWidget;
 begin
   if ComponentCount=0 then
     Exit;
@@ -217,8 +216,6 @@ end;
 
 procedure TfpgScrollFrame.HandleMouseScroll(x, y: integer; 
   shiftstate: TShiftState; delta: smallint);
-var
-  old_val, new_val : integer;
 begin
   inherited HandleMouseScroll(x, y, shiftstate, delta);
   with FVScrollBar do
diff --git a/src/gui/fpg_tab.pas b/src/gui/fpg_tab.pas
index 8846a7e1..414c89a2 100644
--- a/src/gui/fpg_tab.pas
+++ b/src/gui/fpg_tab.pas
@@ -183,11 +183,6 @@ implementation
 uses
   fpg_stringutils;
 
-const
-  DFL_TAB_HEIGHT = 21;
-  DFL_TAB_WIDTH = 0;
-  
-  
 // compare function used by FPages.Sort
 
 function SortCompare(Item1, Item2: Pointer): integer;
@@ -409,7 +404,6 @@ var
   wd: integer;  { width delta }
   h: integer;
   hd: integer;  { height delta }
-  msg: TfpgMessageParams;
 begin
   // PageControl has bevelled edges in some themes
   r := fpgStyle.GetControlFrameBorders;
@@ -820,8 +814,6 @@ var
   h: TfpgTabSheet;
   lp: integer;
   toffset: integer;
-  TextLeft, TextTop: Integer;
-  dx: integer;
   lTxtFlags: TfpgTextFlags;
   ActivePageVisible: Boolean;
 begin
diff --git a/src/gui/fpg_trackbar.pas b/src/gui/fpg_trackbar.pas
index 32da0b99..752ae132 100644
--- a/src/gui/fpg_trackbar.pas
+++ b/src/gui/fpg_trackbar.pas
@@ -480,7 +480,7 @@ var
   d: integer;
   area: integer;
   newp: integer;
-  ppos: integer;
+  //ppos: integer;
   tw: TfpgCoord;
 begin
   inherited HandleMouseMove(x, y, btnstate, shiftstate);
@@ -506,7 +506,7 @@ begin
     area  := Width - FSliderLength-4-tw;
   end;
 
-  ppos       := FSliderPos;
+  //ppos       := FSliderPos;
   FSliderPos := FSliderDragStart + d;
 
   if FSliderPos < 0 then
diff --git a/src/gui/messagedialog.inc b/src/gui/messagedialog.inc
index db894f6d..7fea78e8 100644
--- a/src/gui/messagedialog.inc
+++ b/src/gui/messagedialog.inc
@@ -260,7 +260,6 @@ var
   logo: TfpgImage;
   i: integer;
   y: integer;
-  tw: integer;
 begin
   inherited HandlePaint;
   case FDialogType of
diff --git a/src/gui/selectdirdialog.inc b/src/gui/selectdirdialog.inc
index 063c7972..857fb0a2 100644
--- a/src/gui/selectdirdialog.inc
+++ b/src/gui/selectdirdialog.inc
@@ -197,7 +197,6 @@ var
   s: TfpgString;
   dir: TfpgString;
   i: integer;
-  p: integer;
   prevn, nextn: TfpgTreeNode;
 begin
   if AValue = '' then