From ab8b283f9bf6a9c29218fedbe1f0637be0260d98 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Fri, 4 Feb 2005 22:04:23 +0000
Subject: [PATCH] fixed copyword in tab line

git-svn-id: trunk@6736 -
---
 components/synedit/synedit.pp |  4 ++++
 ide/editoroptions.pp          | 19 +++++++++----------
 packager/packagedefs.pas      |  8 +++++---
 packager/packageeditor.pas    |  4 +++-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp
index ad7b88bfd1..0c30eff2e4 100644
--- a/components/synedit/synedit.pp
+++ b/components/synedit/synedit.pp
@@ -7970,7 +7970,11 @@ end;
 
 procedure TCustomSynEdit.SetSelWord;
 begin
+  {$IFDEF SYN_LAZARUS}
+  SetWordBlock(PhysicalToLogicalPos(CaretXY));
+  {$ELSE}
   SetWordBlock(CaretXY);
+  {$ENDIF}
 end;
 
 procedure TCustomSynEdit.SetExtraLineSpacing(const Value: integer);
diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 34161285fb..99d82323ed 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -222,18 +222,17 @@ type
       var FG, BG: TColor);
   published
     // general options
-    property SynEditOptions:TSynEditorOptions
-        read fSynEditOptions write fSynEditOptions
-        default SynEditDefaultOptions;
+    property SynEditOptions:TSynEditorOptions read fSynEditOptions
+                            write fSynEditOptions default SynEditDefaultOptions;
     property CtrlMouseLinks: boolean read fCtrlMouseLinks write fCtrlMouseLinks;
-    property ShowTabCloseButtons: boolean
-        read fShowTabCloseButtons write fShowTabCloseButtons;
-    property UndoAfterSave:boolean
-        read fUndoAfterSave write fUndoAfterSave default true;
-    property FindTextAtCursor:boolean
-        read fFindTextAtCursor write fFindTextAtCursor default true;
+    property ShowTabCloseButtons: boolean read fShowTabCloseButtons
+                                          write fShowTabCloseButtons;
+    property UndoAfterSave: boolean read fUndoAfterSave
+                                    write fUndoAfterSave default true;
+    property FindTextAtCursor: boolean read fFindTextAtCursor
+                                       write fFindTextAtCursor default true;
     property UseSyntaxHighlight:boolean
-        read fUseSyntaxHighlight write fUseSyntaxHighlight default true;
+                read fUseSyntaxHighlight write fUseSyntaxHighlight default true;
     property CopyWordAtCursorOnCopyNone: boolean read FCopyWordAtCursorOnCopyNone
                                               write FCopyWordAtCursorOnCopyNone;
     property ShowGutterHints: boolean read FShowGutterHints write FShowGutterHints;
diff --git a/packager/packagedefs.pas b/packager/packagedefs.pas
index d5a6cc6750..309b2808f8 100644
--- a/packager/packagedefs.pas
+++ b/packager/packagedefs.pas
@@ -655,7 +655,7 @@ type
     function GetFileDialogInitialDir(const DefaultDirectory: string): string;
     procedure MoveFile(CurIndex, NewIndex: integer);
     procedure SortFiles;
-    procedure FixFilesCaseSensitivity;
+    function FixFilesCaseSensitivity: boolean;
     // required dependencies (plus removed required dependencies)
     function FindDependencyByName(const PkgName: string): TPkgDependency;
     function RequiredDepByIndex(Index: integer): TPkgDependency;
@@ -2631,7 +2631,7 @@ begin
   end;
 end;
 
-procedure TLazPackage.FixFilesCaseSensitivity;
+function TLazPackage.FixFilesCaseSensitivity: boolean;
 var
   SrcDirs: TStringList;
   
@@ -2647,7 +2647,7 @@ var
     if OnlyExact then exit;
     // then search for case insensitive match
     Result:=List.Count-1;
-    while (Result>=0) and (AnsiCompareText(Filename,List[Result])<>0) do
+    while (Result>=0) and (CompareText(Filename,List[Result])<>0) do
       dec(Result);
   end;
 
@@ -2691,6 +2691,7 @@ var
   NewFilename: String;
   CurDir: String;
 begin
+  Result:=false;
   Cnt:=FileCount;
   SrcDirs:=nil;
   try
@@ -2711,6 +2712,7 @@ begin
             AppendPathDelim(ExtractFilePath(CurFile.Filename))+NewShortFilename;
         //debugln('TLazPackage.FixFilesCaseSensitivity New ',dbgs(i),' NewFilename=',NewFilename);
         CurFile.Filename:=NewFilename;
+        Result:=true;
       end;
     end;
   finally
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index e3828b3f43..5377d44ab0 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -1888,8 +1888,10 @@ end;
 
 procedure TPackageEditorForm.DoFixFilesCase;
 begin
-  LazPackage.FixFilesCaseSensitivity;
+  if LazPackage.FixFilesCaseSensitivity then
+    LazPackage.Modified:=true;
   UpdateFiles;
+  UpdateButtons;
 end;
 
 constructor TPackageEditorForm.Create(TheOwner: TComponent);