From 5994265adde56013013b5d28b11a255e3b2a8da5 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Sat, 9 Aug 2008 15:48:16 +0000
Subject: [PATCH] cleanup

git-svn-id: trunk@16010 -
---
 lcl/include/icon.inc                 | 59 ++++++----------------------
 lcl/interfaces/win32/win32winapi.inc |  2 +-
 2 files changed, 12 insertions(+), 49 deletions(-)

diff --git a/lcl/include/icon.inc b/lcl/include/icon.inc
index e2442df85e..5515075d75 100644
--- a/lcl/include/icon.inc
+++ b/lcl/include/icon.inc
@@ -805,7 +805,6 @@ var
   NewIcon, OldIcon: TSharedIcon;
   n: Integer;
   OldImage, NewImage: TIconImage;
-//  OldBitmap: TSharedCustomBitmap;
   OldSharedImage: TSharedImage;
 begin
   if FSharedImage.RefCount <= 1 then Exit;
@@ -815,68 +814,32 @@ begin
     NewIcon.Reference;
     if CopyContent
     then begin
-      // in theory we should have a compatible shared image
-      // if not, something internal is wrong
-      (*
-      if FSharedImage is TSharedIcon then
+      OldIcon := FSharedImage as TSharedIcon;
+      for n := 0 to OldIcon.FImages.Count -1 do
       begin
-      *)
-        OldIcon := FSharedImage as TSharedIcon;
-        for n := 0 to OldIcon.FImages.Count -1 do
-        begin
-          OldImage := TIconImage(OldIcon.FImages[n]);
-          NewImage := TIconImage.Create(OldImage.PixelFormat, OldImage.Height, OldImage.Width);
-          NewIcon.FImages.Add(NewImage);
-          NewImage.FImage.Description := OldImage.FImage.Description;
-          NewImage.FImage.DataSize := OldImage.FImage.DataSize;
-          if NewImage.FImage.DataSize > 0
-          then begin
-            NewImage.FImage.Data := GetMem(NewImage.FImage.DataSize);
-            Move(OldImage.FImage.Data^, NewImage.FImage.Data^, NewImage.FImage.DataSize);
-          end;
-          NewImage.FImage.MaskSize := OldImage.FImage.MaskSize;
-          if NewImage.FImage.MaskSize > 0
-          then begin
-            NewImage.FImage.Mask := GetMem(NewImage.FImage.MaskSize);
-            Move(OldImage.FImage.Mask^, NewImage.FImage.Mask^, NewImage.FImage.MaskSize);
-          end;
-          NewImage.FImage.PaletteSize := OldImage.FImage.PaletteSize;
-          if NewImage.FImage.PaletteSize > 0
-          then begin
-            NewImage.FImage.Palette := GetMem(NewImage.FImage.PaletteSize);
-            Move(OldImage.FImage.Palette^, NewImage.FImage.Palette^, NewImage.FImage.PaletteSize);
-          end;
-        end;
-(*
-      end
-      else
-      if FSharedImage is TSharedCustomBitmap then
-      begin
-        OldBitmap := FSharedImage as TSharedCustomBitmap;
-        NewImage := TIconImage.Create(OldBitmap.PixelFormat, OldBitmap.Height, OldBitmap.Width);
+        OldImage := TIconImage(OldIcon.FImages[n]);
+        NewImage := TIconImage.Create(OldImage.PixelFormat, OldImage.Height, OldImage.Width);
         NewIcon.FImages.Add(NewImage);
-        NewImage.FImage.Description := OldBitmap.FImage.Description;
-        NewImage.FImage.DataSize := OldBitmap.FImage.DataSize;
+        NewImage.FImage.Description := OldImage.FImage.Description;
+        NewImage.FImage.DataSize := OldImage.FImage.DataSize;
         if NewImage.FImage.DataSize > 0
         then begin
           NewImage.FImage.Data := GetMem(NewImage.FImage.DataSize);
-          Move(OldBitmap.FImage.Data^, NewImage.FImage.Data^, NewImage.FImage.DataSize);
+          Move(OldImage.FImage.Data^, NewImage.FImage.Data^, NewImage.FImage.DataSize);
         end;
-        NewImage.FImage.MaskSize := OldBitmap.FImage.MaskSize;
+        NewImage.FImage.MaskSize := OldImage.FImage.MaskSize;
         if NewImage.FImage.MaskSize > 0
         then begin
           NewImage.FImage.Mask := GetMem(NewImage.FImage.MaskSize);
-          Move(OldBitmap.FImage.Mask^, NewImage.FImage.Mask^, NewImage.FImage.MaskSize);
+          Move(OldImage.FImage.Mask^, NewImage.FImage.Mask^, NewImage.FImage.MaskSize);
         end;
-        NewImage.FImage.PaletteSize := OldBitmap.FImage.PaletteSize;
+        NewImage.FImage.PaletteSize := OldImage.FImage.PaletteSize;
         if NewImage.FImage.PaletteSize > 0
         then begin
           NewImage.FImage.Palette := GetMem(NewImage.FImage.PaletteSize);
-          Move(OldBitmap.FImage.Palette^, NewImage.FImage.Palette^, NewImage.FImage.PaletteSize);
+          Move(OldImage.FImage.Palette^, NewImage.FImage.Palette^, NewImage.FImage.PaletteSize);
         end;
-        NewImage.FImage.Description.MaskBitsPerPixel := 1;
       end;
-*)
     end;
     FreeCanvasContext;
     OldSharedImage := FSharedImage;
diff --git a/lcl/interfaces/win32/win32winapi.inc b/lcl/interfaces/win32/win32winapi.inc
index 3f4dfd5343..f382cddb3b 100644
--- a/lcl/interfaces/win32/win32winapi.inc
+++ b/lcl/interfaces/win32/win32winapi.inc
@@ -159,7 +159,7 @@ var
   var
     ScrollInfo: Windows.tagScrollInfo;
     WParam: Windows.WParam;
-    ScrollMsg, ScrollBar, WheelScrollLines: dword;
+    ScrollMsg, ScrollBar: dword;
     ScrollOffset: integer;
   begin
     if not TWinControl(Sender).HandleAllocated then