From e76bd25f1c1a0cf3e33d170c76c173bec86437f2 Mon Sep 17 00:00:00 2001
From: jesusr <jesusr@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 23 Nov 2007 06:46:07 +0000
Subject: [PATCH] iconeditor, fixes compilation under linux/windows

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@286 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 applications/iconeditor/laziconeditor.lpi     |   3 +--
 applications/iconeditor/laziconeditor.lpr     |   4 +++-
 applications/iconeditor/laziconeditor.res     | Bin 0 -> 692 bytes
 applications/iconeditor/resizepaperdialog.pas |   4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 applications/iconeditor/laziconeditor.res

diff --git a/applications/iconeditor/laziconeditor.lpi b/applications/iconeditor/laziconeditor.lpi
index d6128045f..82b9c0357 100644
--- a/applications/iconeditor/laziconeditor.lpi
+++ b/applications/iconeditor/laziconeditor.lpi
@@ -1017,8 +1017,7 @@
     <Version Value="5"/>
     <PathDelim Value="\"/>
     <SearchPaths>
-      <OtherUnitFiles Value="..\packages\LazRGBGraphics_svn\;..\packages\LazColorPalette\"/>
-      <UnitOutputDirectory Value="Units\$(LCLWidgetType)"/>
+      <UnitOutputDirectory Value="units\$(LCLWidgetType)"/>
     </SearchPaths>
     <CodeGeneration>
       <Generate Value="Faster"/>
diff --git a/applications/iconeditor/laziconeditor.lpr b/applications/iconeditor/laziconeditor.lpr
index fa4c7a6f0..4e64cabdf 100644
--- a/applications/iconeditor/laziconeditor.lpr
+++ b/applications/iconeditor/laziconeditor.lpr
@@ -11,8 +11,10 @@ uses
   { add your units here }, main, Preview, PictureManager, PictureCtrls, Test, JPEGForLazarus,
   NewDialog, ResizeDialog, ResizePaperDialog, PictureDialog, AboutDialog,
   LazRGBGraphics, LazColorPalette;
-
+  
+{$IFDEF WINDOWS}
 {$R laziconeditor.res}
+{$ENDIF}
 
 begin
   Application.Title:='Lazarus Icon Editor';
diff --git a/applications/iconeditor/laziconeditor.res b/applications/iconeditor/laziconeditor.res
new file mode 100644
index 0000000000000000000000000000000000000000..41de39574661d712b2005eb6eb501be4bc058634
GIT binary patch
literal 692
zcmZvaJx;?w5Jta5E=WgBg%F~kKt^&yO+bo-2qMTWvLF}>$FZEH;8t9KTW|z=Za{du
z>&1!1toBdycIKP0C260zUi-;$%giwNcVPytZxjW{3=@v2X1Zs+&@HElrn=@nVZG#R
z?IZgBkp>KJVQ;VhZl4aC$*57GN;%OAm6{W|(vz0FdUs5$M6u482^y@TJ(ueoX2F=l
z8?D+b2OGXx8NN4^W{wL&jvW*7jft?*gVRwHsUU6@P_pho2R4OmpgShkiB6ezk9p<u
z+Zv2xD{_}T1xGIb75?0LZ6!52Z6|U)^U|Bw*>QIenI3t!U~lyDSGDBXX&b|K)aDJk
z?ag+|o7Z>)yCm8xwVR$o(PvxtHq)=ZU;EgFPo1`qx%-;Zq3o~atEkXkLT>hZ6n#a%
Dy9!#*

literal 0
HcmV?d00001

diff --git a/applications/iconeditor/resizepaperdialog.pas b/applications/iconeditor/resizepaperdialog.pas
index 81091fbcc..4ff03e024 100644
--- a/applications/iconeditor/resizepaperdialog.pas
+++ b/applications/iconeditor/resizepaperdialog.pas
@@ -198,11 +198,11 @@ begin
   SW := Max(1, Round(Picture.Width * FPreviewFactor));
   SH := Max(1, Round(Picture.Height * FPreviewFactor));
 
-  Preview.PaperColor := ColorButtonPaper.ButtonColor;
+  Preview.Color := ColorButtonPaper.ButtonColor;
   Preview.Picture.Free;
   Preview.Picture := TPictureBitmap.CreateAsCopy(Picture);
   Preview.Picture.StretchTrunc(SW, SH);
-  Preview.ResizePaper(W, H, TPicturePos(ComboBoxPicturePosition.ItemIndex));
+  //Preview.ResizePaper(W, H, TPicturePos(ComboBoxPicturePosition.ItemIndex));
 end;
 
 procedure TResizePaperDialogForm.Apply;