LCL,LazUtils: Move ModalResult and the mr... consts to a new unit in LazUtils. They are used in non-GUI programs, too.

git-svn-id: trunk@58205 -
2025-04-14 00:59:38 +02:00 · 2018-06-09 14:39:49 +00:00 · 2018-06-09 14:39:49 +00:00 · 5f57884ed1
commit 5f57884ed1
parent f440f660a2
10 changed files with 97 additions and 44 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -3286,6 +3286,7 @@ components/lazutils/lcsvutils.pas svneol=native#text/pascal
 components/lazutils/lookupstringlist.pas svneol=native#text/pascal
 components/lazutils/maps.pp svneol=native#text/pascal
 components/lazutils/masks.pas svneol=native#text/pascal
+components/lazutils/modalresultdef.pas svneol=native#text/pascal
 components/lazutils/paswstring.pas svneol=native#text/pascal
 components/lazutils/stringhashlist.pas svneol=native#text/pascal
 components/lazutils/test/TestLazStorageMem.lpi svneol=native#text/plain
--- a/components/ideintf/propedits.pp
+++ b/components/ideintf/propedits.pp
@ -31,7 +31,8 @@ uses
  // LazControls
  {$IFnDEF UseOINormalCheckBox} CheckBoxThemed, {$ENDIF}
  // LazUtils
-  FileUtil, StringHashList, LazMethodList, FPCAdds, // for StrToQWord in older fpc versions
+  FileUtil, StringHashList, LazMethodList, ModalResultDef,
+  FPCAdds, // for StrToQWord in older fpc versions
  // IdeIntf
  ObjInspStrConsts, PropEditUtils, IDEUtils,
  // Forms with .lfm files
--- a/components/lazutils/lazutils.lpk
+++ b/components/lazutils/lazutils.lpk
@ -16,7 +16,7 @@
    <Description Value="Useful units for Lazarus packages."/>
    <License Value="Modified LGPL-2"/>
    <Version Major="1"/>
-    <Files Count="97">
+    <Files Count="98">
      <Item1>
        <Filename Value="LazLoggerImpl.inc"/>
        <Type Value="Include"/>
@ -395,16 +395,20 @@
      </Item94>
      <Item95>
        <Filename Value="lazpasreadutil.pas"/>
-        <UnitName Value="lazpasreadutil"/>
+        <UnitName Value="LazPasReadUtil"/>
      </Item95>
      <Item96>
        <Filename Value="integerlist.pas"/>
-        <UnitName Value="integerlist"/>
+        <UnitName Value="IntegerList"/>
      </Item96>
      <Item97>
        <Filename Value="lazversion.pas"/>
-        <UnitName Value="lazversion"/>
+        <UnitName Value="LazVersion"/>
      </Item97>
+      <Item98>
+        <Filename Value="modalresultdef.pas"/>
+        <UnitName Value="ModalResultDef"/>
+      </Item98>
    </Files>
    <LazDoc Paths="../../docs/xml/lazutils"/>
    <i18n>
--- a/components/lazutils/lazutils.pas
+++ b/components/lazutils/lazutils.pas
@ -21,7 +21,8 @@ uses
  StringHashList, TextStrings, Translations, TTCache, TTCalc, TTCMap, TTDebug, 
  TTError, TTFile, TTGLoad, TTInterp, TTLoad, TTMemory, TTObjs, TTProfile, 
  TTRASTER, TTTables, TTTypes, UTF8Process, HTML2TextRender, Laz_AVL_Tree, 
-  CompWriterPas, LazPasReadUtil, IntegerList, LazVersion, LazarusPackageIntf;
+  CompWriterPas, LazPasReadUtil, IntegerList, LazVersion, ModalResultDef, 
+  LazarusPackageIntf;

 implementation

--- a/components/lazutils/modalresultdef.pas
+++ b/components/lazutils/modalresultdef.pas
@ -0,0 +1,49 @@
+unit ModalResultDef;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils;
+
+type
+  TModalResult = low(Integer)..high(Integer);
+  PModalResult = ^TModalResult;
+
+const
+  // Used for ModalResult
+  mrNone = 0;
+  mrOK = mrNone + 1;
+  mrCancel = mrNone + 2;
+  mrAbort = mrNone + 3;
+  mrRetry = mrNone + 4;
+  mrIgnore = mrNone + 5;
+  mrYes = mrNone + 6;
+  mrNo = mrNone + 7;
+  mrAll = mrNone + 8;
+  mrNoToAll = mrNone + 9;
+  mrYesToAll = mrNone + 10;
+  mrClose = mrNone + 11;
+  mrLast = mrClose;
+
+  // String representation of ModalResult values
+  ModalResultStr: array[mrNone..mrLast] of shortstring = (
+    'mrNone',
+    'mrOk',
+    'mrCancel',
+    'mrAbort',
+    'mrRetry',
+    'mrIgnore',
+    'mrYes',
+    'mrNo',
+    'mrAll',
+    'mrNoToAll',
+    'mrYesToAll',
+    'mrClose');
+
+
+implementation
+
+end.
+
--- a/components/messagecomposer/messagecomposer.pas
+++ b/components/messagecomposer/messagecomposer.pas
@ -26,8 +26,13 @@ unit MessageComposer;
 interface

 uses
-  Classes, SysUtils, LResources, LCLType, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils,
+  // LCL
+  LResources, LCLType, Forms, Controls, Graphics, Dialogs,
  StdCtrls, ExtCtrls, Spin, Grids, ActnList, Buttons, EditBtn,
+  // LazUtils
+  ModalResultDef,
+  // IdeIntf
  IDECommands, MenuIntf, LazIDEIntf, SrcEditorIntf;

 type
@ -114,9 +119,9 @@ type
    procedure TestExecute(Sender: TObject);
    procedure UpdateQuestioDlgResultExecute(Sender: TObject);
  private
-    { private declarations }
+
  public
-    { public declarations }
+
  end;

 procedure Register;
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@ -41,40 +41,25 @@ uses
  InterfaceBase, ImgList, PropertyStorage, Menus, ActnList, LCLClasses,
  LResources, LCLPlatformDef,
  // LazUtils
-  LazMethodList;
+  LazMethodList, ModalResultDef;

 {$I controlconsts.inc}

 const
  // Used for ModalResult
-  mrNone = 0;
-  mrOK = mrNone + 1;
-  mrCancel = mrNone + 2;
-  mrAbort = mrNone + 3;
-  mrRetry = mrNone + 4;
-  mrIgnore = mrNone + 5;
-  mrYes = mrNone + 6;
-  mrNo = mrNone + 7;
-  mrAll = mrNone + 8;
-  mrNoToAll = mrNone + 9;
-  mrYesToAll = mrNone + 10;
-  mrClose = mrNone + 11;
-  mrLast = mrClose;
-
-  // String representation of ModalResult values
-  ModalResultStr: array[mrNone..mrLast] of shortstring = (
-    'mrNone',
-    'mrOk',
-    'mrCancel',
-    'mrAbort',
-    'mrRetry',
-    'mrIgnore',
-    'mrYes',
-    'mrNo',
-    'mrAll',
-    'mrNoToAll',
-    'mrYesToAll',
-    'mrClose');
+  mrNone    = ModalResultDef.mrNone;
+  mrOK      = ModalResultDef.mrOK;
+  mrCancel  = ModalResultDef.mrCancel;
+  mrAbort   = ModalResultDef.mrAbort;
+  mrRetry   = ModalResultDef.mrRetry;
+  mrIgnore  = ModalResultDef.mrIgnore;
+  mrYes     = ModalResultDef.mrYes;
+  mrNo      = ModalResultDef.mrNo;
+  mrAll     = ModalResultDef.mrAll;
+  mrNoToAll = ModalResultDef.mrNoToAll;
+  mrYesToAll= ModalResultDef.mrYesToAll;
+  mrClose   = ModalResultDef.mrClose;
+  mrLast    = ModalResultDef.mrLast;

  // define aliases for Delphi compatibility
  fsSurface = GraphType.fsSurface;
--- a/lcl/dialogs.pp
+++ b/lcl/dialogs.pp
@ -28,6 +28,9 @@ uses
  Forms, Controls, Themes, GraphType, Graphics, Buttons, ButtonPanel, StdCtrls,
  ExtCtrls, LCLClasses, ClipBrd, Menus, LCLTaskDialog,
  // LazUtils
+  {$ifdef DebugCommonDialogEvents}
+  ModalResultDef,
+  {$endif}
  FileUtil, LazFileUtils;


--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@ -39,7 +39,7 @@ uses
  LResources, GraphType, Graphics, Menus, LMessages, CustomTimer, ActnList,
  ClipBrd, HelpIntfs, Controls, ImgList, Themes,
  // LazUtils
-  LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList
+  LazFileUtils, LazUTF8, Maps, IntegerList, LazMethodList, ModalResultDef
  {$ifndef wince},gettext{$endif}// remove ifdefs when gettext is fixed and a new fpc is released
  ;

@ -413,8 +413,8 @@ type
    );
  TFormState = set of TFormStateType;

-  TModalResult = low(Integer)..high(Integer);
-  PModalResult = ^TModalResult;
+  TModalResult = ModalResultDef.TModalResult;
+  PModalResult = ^ModalResultDef.TModalResult;

  TFormHandlerType = (
    fhtFirstShow,
--- a/lcl/interfaces/win32/win32wsdialogs.pp
+++ b/lcl/interfaces/win32/win32wsdialogs.pp
@ -29,10 +29,14 @@ uses
 // uncomment only when needed for registration
 ////////////////////////////////////////////////////
 // rtl
-  Windows, shlobj, ShellApi, ActiveX, SysUtils, Classes,
-  CommDlg,
+  Windows, shlobj, ShellApi, ActiveX, SysUtils, Classes, CommDlg,
 // lcl
-  LCLProc, LCLType, LazUTF8, Dialogs, Controls, Graphics, Forms, LazFileUtils, Masks,
+  LCLProc, LCLType, Dialogs, Controls, Graphics, Forms, Masks,
+  // LazUtils
+  {$ifdef DebugCommonDialogEvents}
+  ModalResultDef,
+  {$endif}
+  LazFileUtils, LazUTF8,
 // ws
  WSDialogs, WSLCLClasses, Win32Extra, Win32Int, InterfaceBase,
  Win32Proc;