Browse Source

Merge branch 'is-6' into anchors

Martijn Laan 6 years ago
parent
commit
ea26323e98
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Components/NewTabSet.pas
  2. 1 1
      Projects/CompMsgs.pas
  3. 1 1
      Projects/ScriptFunc_C.pas

+ 1 - 1
Components/NewTabSet.pas

@@ -34,7 +34,7 @@ type
     destructor Destroy; override;
   published
     property Align;
-    property Flat: Boolean read FFlat write FFlat;
+    property Flat: Boolean read FFlat write FFlat default True;
     property Font;
     property ParentFont;
     property TabIndex: Integer read FTabIndex write SetTabIndex;

+ 1 - 1
Projects/CompMsgs.pas

@@ -293,7 +293,7 @@ const
 
   { [Code] }
   SCompilerCodeUnsupportedEventFunction = 'Event function named "%s" is no longer supported. Create a "%s" function instead';
-  SCompilerCodeFunctionRenamed = 'Support function "%s" has been renamed. Use "%s" instead.';
+  SCompilerCodeFunctionRenamedWithAlternative = 'Support function "%s" has been renamed. Use "%s" instead or consider using "%s".';
 
   { [Types] }
   SCompilerTypesCustomTypeAlreadyDefined = 'A custom type has already been defined';

+ 1 - 1
Projects/ScriptFunc_C.pas

@@ -146,7 +146,7 @@ begin
   RegisterFunctionTable(BrowseFuncTable);
   RegisterFunctionTable(CmnFuncTable);
   RegisterFunctionTable(CmnFunc2Table);
-  ObsoleteFunctionWarnings.Add('IsAdminLoggedOn', Format(SCompilerCodeFunctionRenamed, ['IsAdminLoggedOn', 'IsAdmin']));
+  ObsoleteFunctionWarnings.Add('IsAdminLoggedOn', Format(SCompilerCodeFunctionRenamedWithAlternative, ['IsAdminLoggedOn', 'IsAdmin', 'IsAdminInstallMode']));
   RegisterFunctionTable(InstallTable);
   RegisterFunctionTable(InstFuncTable);
   RegisterFunctionTable(InstFnc2Table);