Browse Source

Fix compiling in FPC 3.0.4. BGRAControls v6.0.2.

lainz 5 years ago
parent
commit
bb3d037c53
5 changed files with 15 additions and 11 deletions
  1. 4 4
      bcmdbutton.pas
  2. 1 1
      bgracontrols.lpk
  3. 2 2
      bgracontrols.stat
  4. 6 2
      materialcolors.pas
  5. 2 2
      update_bgracontrols_force.json

+ 4 - 4
bcmdbutton.pas

@@ -22,18 +22,18 @@ uses
 
 var
   // Default icons for Check Box
-  BCMDBUTTONBALLOTBOX: string = '☐'; // '✗'
+  {BCMDBUTTONBALLOTBOX: string = '☐'; // '✗'
   BCMDBUTTONBALLOTBOXWITHCHECK: string = '☑'; // '✓'
 
   // Default icons for Radio Button
   BCMDBUTTONRADIOBUTTON: string = '🔘';
-  BCMDBUTTONRADIOBUTTONCIRCLE: string = '◯';
+  BCMDBUTTONRADIOBUTTONCIRCLE: string = '◯';}
 
   // Characters that can be used on systems that lack of the previous unicode symbols
-  {BCMDBUTTONBALLOTBOX: string = '[  ]';
+  BCMDBUTTONBALLOTBOX: string = '[  ]';
   BCMDBUTTONBALLOTBOXWITHCHECK: string = '[X]';
   BCMDBUTTONRADIOBUTTON: string = '[O]';
-  BCMDBUTTONRADIOBUTTONCIRCLE: string = '[  ]';}
+  BCMDBUTTONRADIOBUTTONCIRCLE: string = '[  ]';
 
   // Animation speed
   // Possible values: between 0 and 1

+ 1 - 1
bgracontrols.lpk

@@ -33,7 +33,7 @@
     </CompilerOptions>
     <Description Value="BGRA Controls is a set of graphical UI elements that you can use with Lazarus LCL applications."/>
     <License Value="Modified LGPL"/>
-    <Version Major="6"/>
+    <Version Major="6" Release="2"/>
     <Files Count="47">
       <Item1>
         <Filename Value="bcbasectrls.pas"/>

+ 2 - 2
bgracontrols.stat

@@ -2,8 +2,8 @@
 EditorSecs=106
 DesignerSecs=1
 InspectorSecs=16
-CompileSecs=29377
-OtherSecs=378
+CompileSecs=36721
+OtherSecs=393
 StartTime=30/11/2018 11:43:57
 RealKeys=0
 EffectiveKeys=0

+ 6 - 2
materialcolors.pas

@@ -19,7 +19,7 @@ unit MaterialColors;
 interface
 
 uses
-  Classes, SysUtils, BGRABitmap, BGRABitmapTypes, Generics.Collections;
+  Classes, SysUtils, BGRABitmap, BGRABitmapTypes, {$IFDEF FPC}FGL{$ELSE}Generics.Collections{$ENDIF};
 
 type
 
@@ -44,7 +44,11 @@ type
         aM700, aM800, aM900, aA100, aA200, aA400, aA700: string);
   end;
 
-  TMaterialColorsList = {specialize} TDictionary<string, TMaterialColors>;
+  {$IFDEF FPC}
+  TMaterialColorsList = TFPGMap<string, TMaterialColors>;
+  {$ELSE}
+  TMaterialColorsList = TDictionary<string, TMaterialColors>;
+  {$ENDIF}
 
 procedure MaterialColorsListStr(AList: TStrings);
 

+ 2 - 2
update_bgracontrols_force.json

@@ -6,9 +6,9 @@
   "UpdatePackageFiles" : [
     {
       "ForceNotify" : true,
-      "InternalVersion" : 19,
+      "InternalVersion" : 20,
       "Name" : "bgracontrols.lpk",
-      "Version" : "6.0.0.0"
+      "Version" : "6.0.2.0"
     },
     {
       "ForceNotify" : false,