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 -

.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

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

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>

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
 

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.
+

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;

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;
+  mrNone    = ModalResultDef.mrNone;
-  mrOK = mrNone + 1;
+  mrOK      = ModalResultDef.mrOK;
-  mrCancel = mrNone + 2;
+  mrCancel  = ModalResultDef.mrCancel;
-  mrAbort = mrNone + 3;
+  mrAbort   = ModalResultDef.mrAbort;
-  mrRetry = mrNone + 4;
+  mrRetry   = ModalResultDef.mrRetry;
-  mrIgnore = mrNone + 5;
+  mrIgnore  = ModalResultDef.mrIgnore;
-  mrYes = mrNone + 6;
+  mrYes     = ModalResultDef.mrYes;
-  mrNo = mrNone + 7;
+  mrNo      = ModalResultDef.mrNo;
-  mrAll = mrNone + 8;
+  mrAll     = ModalResultDef.mrAll;
-  mrNoToAll = mrNone + 9;
+  mrNoToAll = ModalResultDef.mrNoToAll;
-  mrYesToAll = mrNone + 10;
+  mrYesToAll= ModalResultDef.mrYesToAll;
-  mrClose = mrNone + 11;
+  mrClose   = ModalResultDef.mrClose;
-  mrLast = mrClose;
+  mrLast    = ModalResultDef.mrLast;
-
-  // String representation of ModalResult values
-  ModalResultStr: array[mrNone..mrLast] of shortstring = (
-    'mrNone',
-    'mrOk',
-    'mrCancel',
-    'mrAbort',
-    'mrRetry',
-    'mrIgnore',
-    'mrYes',
-    'mrNo',
-    'mrAll',
-    'mrNoToAll',
-    'mrYesToAll',
-    'mrClose');
 
   // define aliases for Delphi compatibility
   fsSurface = GraphType.fsSurface;

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;
 
 

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);
+  TModalResult = ModalResultDef.TModalResult;
-  PModalResult = ^TModalResult;
+  PModalResult = ^ModalResultDef.TModalResult;
 
   TFormHandlerType = (
     fhtFirstShow,

lcl/interfaces/win32/win32wsdialogs.pp

@@ -29,10 +29,14 @@ uses
 // uncomment only when needed for registration
 ////////////////////////////////////////////////////
 // rtl
-  Windows, shlobj, ShellApi, ActiveX, SysUtils, Classes,
+  Windows, shlobj, ShellApi, ActiveX, SysUtils, Classes, CommDlg,
-  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;