lazhexeditor: Fixes compilation in newer FPC and renames the project to lazhexeditor

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2312 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2012-02-23 16:12:04 +00:00
parent 540529cf37
commit 7a6c561aec
15 changed files with 51 additions and 5280 deletions
--- a/applications/khexeditor/about.pas
+++ b/applications/khexeditor/about.pas
@@ -1,6 +1,6 @@
 unit About;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/basic.pas
+++ b/applications/khexeditor/basic.pas
@@ -1,6 +1,6 @@
 unit Basic;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

@@ -10,7 +10,7 @@ uses
 {$ELSE}
  Windows, Messages,
 {$ENDIF}
-  Classes, SysUtils, Graphics, StdCtrls, KHexEditor, KControls;
+  Classes, SysUtils, Graphics, StdCtrls, khexeditor, KControls;

 type
  TEnvironmentPacked = packed record
--- a/applications/khexeditor/hexeditorlaz.lrs
+++ b/applications/khexeditor/hexeditorlaz.lrs
--- a/applications/khexeditor/lazhexeditor.inc
+++ b/applications/khexeditor/lazhexeditor.inc
--- a/applications/khexeditor/lazhexeditor.lpi
+++ b/applications/khexeditor/lazhexeditor.lpi
@@ -6,6 +6,7 @@
    <General>
      <SessionStorage Value="InProjectDir"/>
      <MainUnit Value="0"/>
+      <Title Value="lazhexeditor"/>
      <UseXPManifest Value="True"/>
    </General>
    <VersionInfo>
@@ -30,6 +31,7 @@
    <RequiredPackages Count="3">
      <Item1>
        <PackageName Value="KControlsLaz"/>
+        <DefaultFilename Value="..\..\components\kcontrols\source\kcontrolslaz.lpk"/>
      </Item1>
      <Item2>
        <PackageName Value="Printer4Lazarus"/>
@@ -38,10 +40,11 @@
        <PackageName Value="LCL"/>
      </Item3>
    </RequiredPackages>
-    <Units Count="9">
+    <Units Count="11">
      <Unit0>
-        <Filename Value="hexeditorlaz.lpr"/>
+        <Filename Value="lazhexeditor.lpr"/>
        <IsPartOfProject Value="True"/>
+        <UnitName Value="lazhexeditor"/>
      </Unit0>
      <Unit1>
        <Filename Value="about.pas"/>
@@ -104,10 +107,19 @@
        <ResourceBaseClass Value="Form"/>
        <UnitName Value="Search"/>
      </Unit8>
+      <Unit9>
+        <Filename Value="basic.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="Basic"/>
+      </Unit9>
+      <Unit10>
+        <Filename Value="lazhexeditor.inc"/>
+        <IsPartOfProject Value="True"/>
+      </Unit10>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
    <PathDelim Value="\"/>
    <Target>
      <Filename Value="khexeditor"/>
--- a/applications/khexeditor/lazhexeditor.lpr
+++ b/applications/khexeditor/lazhexeditor.lpr
@@ -1,4 +1,4 @@
-program hexeditorlaz;
+program lazhexeditor;

 uses
  Interfaces,
@@ -13,7 +13,7 @@ uses
  Main in 'Main.pas' {MainForm},
  PrintStatus in 'PrintStatus.pas', kcontrolslaz;

-{$IFDEF WINDOWS}{$R hexeditorlaz.rc}{$ENDIF}
+//{$IFDEF WINDOWS}{$R lazhexeditor.rc}{$ENDIF}

 {$R *.res}

--- a/applications/khexeditor/lazhexeditor.res
+++ b/applications/khexeditor/lazhexeditor.res
--- a/applications/khexeditor/main.pas
+++ b/applications/khexeditor/main.pas
@@ -1,6 +1,6 @@
 unit Main;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/options.pas
+++ b/applications/khexeditor/options.pas
@@ -1,6 +1,6 @@
 unit Options;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/printstatus.pas
+++ b/applications/khexeditor/printstatus.pas
@@ -1,6 +1,6 @@
 unit PrintStatus;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/replace.pas
+++ b/applications/khexeditor/replace.pas
@@ -1,6 +1,6 @@
 unit Replace;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/replaceprompt.pas
+++ b/applications/khexeditor/replaceprompt.pas
@@ -1,6 +1,6 @@
 unit ReplacePrompt;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface

--- a/applications/khexeditor/search.lfm
+++ b/applications/khexeditor/search.lfm
@@ -1,7 +1,7 @@
 object SearchForm: TSearchForm
-  Left = 1005
+  Left = 409
  Height = 204
-  Top = 825
+  Top = 156
  Width = 330
  BorderStyle = bsDialog
  Caption = 'Find Text'
@@ -11,7 +11,7 @@ object SearchForm: TSearchForm
  Font.Name = 'Tahoma'
  OnShow = FormShow
  Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '0.9.31'
  object LBFindText: TLabel
    Left = 8
    Height = 14
@@ -93,8 +93,8 @@ object SearchForm: TSearchForm
      Width = 58
      Caption = 'Forwar&d'
      Checked = True
-      State = cbChecked
      TabOrder = 0
+      TabStop = True
    end
    object RBBackward: TRadioButton
      Left = 8
@@ -103,7 +103,6 @@ object SearchForm: TSearchForm
      Width = 64
      Caption = '&Backward'
      TabOrder = 1
-      TabStop = False
    end
  end
  object GBScope: TGroupBox
@@ -122,8 +121,8 @@ object SearchForm: TSearchForm
      Width = 47
      Caption = '&Global'
      Checked = True
-      State = cbChecked
      TabOrder = 0
+      TabStop = True
    end
    object RBSelectedOnly: TRadioButton
      Left = 8
@@ -132,7 +131,6 @@ object SearchForm: TSearchForm
      Width = 82
      Caption = '&Selected only'
      TabOrder = 1
-      TabStop = False
    end
  end
  object GBOrigin: TGroupBox
@@ -151,8 +149,8 @@ object SearchForm: TSearchForm
      Width = 75
      Caption = 'Fro&m cursor'
      Checked = True
-      State = cbChecked
      TabOrder = 0
+      TabStop = True
    end
    object RBEntireScope: TRadioButton
      Left = 8
@@ -161,7 +159,6 @@ object SearchForm: TSearchForm
      Width = 77
      Caption = '&Entire scope'
      TabOrder = 1
-      TabStop = False
    end
  end
 end
--- a/applications/khexeditor/search.lrs
+++ b/applications/khexeditor/search.lrs
@@ -1,11 +1,11 @@
 { This is an automatically generated lazarus resource file }

 LazarusResources.Add('TSearchForm','FORMDATA',[
-  'TPF0'#11'TSearchForm'#10'SearchForm'#4'Left'#3#237#3#6'Height'#3#204#0#3'Top'
-  +#3'9'#3#5'Width'#3'J'#1#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#9'Find Te'
-  +'xt'#12'ClientHeight'#3#204#0#11'ClientWidth'#3'J'#1#11'Font.Height'#2#245#9
+  'TPF0'#11'TSearchForm'#10'SearchForm'#4'Left'#3#153#1#6'Height'#3#204#0#3'Top'
+  +#3#156#0#5'Width'#3'J'#1#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#9'Find T'
+  +'ext'#12'ClientHeight'#3#204#0#11'ClientWidth'#3'J'#1#11'Font.Height'#2#245#9
  +'Font.Name'#6#6'Tahoma'#6'OnShow'#7#8'FormShow'#8'Position'#7#14'poScreenCen'
-  +'ter'#10'LCLVersion'#6#6'0.9.29'#0#6'TLabel'#10'LBFindText'#4'Left'#2#8#6'He'
+  +'ter'#10'LCLVersion'#6#6'0.9.31'#0#6'TLabel'#10'LBFindText'#4'Left'#2#8#6'He'
  +'ight'#2#14#3'Top'#2#12#5'Width'#2'='#7'Caption'#6#14'&Text to find:'#12'Foc'
  +'usControl'#7#12'CBTextToFind'#11'ParentColor'#8#0#0#9'TComboBox'#12'CBTextT'
  +'oFind'#4'Left'#2'H'#6'Height'#2#21#3'Top'#2#8#5'Width'#3#249#0#10'ItemHeigh'
@@ -24,20 +24,19 @@ LazarusResources.Add('TSearchForm','FORMDATA',[
  +'ht'#2'='#3'Top'#2'$'#5'Width'#3#129#0#7'Caption'#6#9'Direction'#12'ClientHe'
  +'ight'#2'+'#11'ClientWidth'#2'}'#8'TabOrder'#2#4#0#12'TRadioButton'#9'RBForw'
  +'ard'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2':'#7'Caption'#6#8'For'
-  +'war&d'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioBu'
-  +'tton'#10'RBBackward'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#24#5'Width'#2'@'#7
-  +'Caption'#6#9'&Backward'#8'TabOrder'#2#1#7'TabStop'#8#0#0#0#9'TGroupBox'#7'G'
-  +'BScope'#4'Left'#2#8#6'Height'#2'='#3'Top'#2'h'#5'Width'#3#173#0#7'Caption'#6
-  +#5'Scope'#12'ClientHeight'#2'+'#11'ClientWidth'#3#169#0#8'TabOrder'#2#5#0#12
-  +'TRadioButton'#8'RBGlobal'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2
-  +'/'#7'Caption'#6#7'&Global'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'
-  +#2#0#0#0#12'TRadioButton'#14'RBSelectedOnly'#4'Left'#2#8#6'Height'#2#17#3'To'
-  +'p'#2#24#5'Width'#2'R'#7'Caption'#6#14'&Selected only'#8'TabOrder'#2#1#7'Tab'
-  +'Stop'#8#0#0#0#9'TGroupBox'#8'GBOrigin'#4'Left'#3#192#0#6'Height'#2'='#3'Top'
-  +#2'h'#5'Width'#3#129#0#7'Caption'#6#6'Origin'#12'ClientHeight'#2'+'#11'Clien'
-  +'tWidth'#2'}'#8'TabOrder'#2#6#0#12'TRadioButton'#12'RBFromCursor'#4'Left'#2#8
-  +#6'Height'#2#17#3'Top'#2#4#5'Width'#2'K'#7'Caption'#6#12'Fro&m cursor'#7'Che'
-  +'cked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton'#13'RBE'
-  +'ntireScope'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#24#5'Width'#2'M'#7'Caption'
-  +#6#13'&Entire scope'#8'TabOrder'#2#1#7'TabStop'#8#0#0#0#0
+  +'war&d'#7'Checked'#9#8'TabOrder'#2#0#7'TabStop'#9#0#0#12'TRadioButton'#10'RB'
+  +'Backward'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#24#5'Width'#2'@'#7'Caption'#6
+  +#9'&Backward'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#7'GBScope'#4'Left'#2#8#6'He'
+  +'ight'#2'='#3'Top'#2'h'#5'Width'#3#173#0#7'Caption'#6#5'Scope'#12'ClientHeig'
+  +'ht'#2'+'#11'ClientWidth'#3#169#0#8'TabOrder'#2#5#0#12'TRadioButton'#8'RBGlo'
+  +'bal'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2'/'#7'Caption'#6#7'&Gl'
+  +'obal'#7'Checked'#9#8'TabOrder'#2#0#7'TabStop'#9#0#0#12'TRadioButton'#14'RBS'
+  +'electedOnly'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#24#5'Width'#2'R'#7'Caption'
+  +#6#14'&Selected only'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#8'GBOrigin'#4'Left'
+  +#3#192#0#6'Height'#2'='#3'Top'#2'h'#5'Width'#3#129#0#7'Caption'#6#6'Origin'
+  +#12'ClientHeight'#2'+'#11'ClientWidth'#2'}'#8'TabOrder'#2#6#0#12'TRadioButto'
+  +'n'#12'RBFromCursor'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2'K'#7'C'
+  +'aption'#6#12'Fro&m cursor'#7'Checked'#9#8'TabOrder'#2#0#7'TabStop'#9#0#0#12
+  +'TRadioButton'#13'RBEntireScope'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#24#5'Wi'
+  +'dth'#2'M'#7'Caption'#6#13'&Entire scope'#8'TabOrder'#2#1#0#0#0#0
 ]);
--- a/applications/khexeditor/search.pas
+++ b/applications/khexeditor/search.pas
@@ -1,6 +1,6 @@
 unit Search;

-{$include kcontrols.inc}
+{$include lazhexeditor.inc}

 interface