correction of the bug MagicFoundation#13

DanieleDyr · Jun 19, 2018 · 61b125d · 61b125d
1 parent a7c665c
commit 61b125d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 3 deletions.
diff --git a/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.bpi b/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.bpi
diff --git a/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.bpl b/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.bpl
diff --git a/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.dcp b/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.dcp
diff --git a/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.lib b/lib/bpl/alcinoe/Win32/tokyo/Alcinoe_tokyo.lib
diff --git a/lib/jar/com.alcinoe/alcinoe.jar b/lib/jar/com.alcinoe/alcinoe.jar
diff --git a/source/ALFmxLayouts.pas b/source/ALFmxLayouts.pas
@@ -658,9 +658,9 @@ procedure TALCustomScrollBox.DoRealign;
       finally
         fHScrollBar.ValueRange.EndUpdate;
       end;
-      fHScrollBar.SetBounds(fVScrollBar.Margins.left,
-                            height - fHScrollBar.Height - fVScrollBar.Margins.bottom,
-                            width - fVScrollBar.Margins.left - fVScrollBar.Margins.right,
+      fHScrollBar.SetBounds(fHScrollBar.Margins.left,
+                            height - fHScrollBar.Height - fHScrollBar.Margins.bottom,
+                            width - fHScrollBar.Margins.left - fHScrollBar.Margins.right,
                             fHScrollBar.Height);
     end;
   end;

diff --git a/source/hpp/Win32/tokyo/ALQuickSortList.hpp b/source/hpp/Win32/tokyo/ALQuickSortList.hpp
@@ -126,6 +126,8 @@ class PASCALIMPLEMENTATION TALIntegerList : public TALBaseQuickSortList
 	int __fastcall IndexOfObject(System::TObject* AObject);
 	int __fastcall Add(const int Item);
 	int __fastcall AddObject(const int Item, System::TObject* AObject);
+	bool __fastcall TryAdd(const int Item);
+	bool __fastcall TryAddObject(const int Item, System::TObject* AObject);
 	bool __fastcall Find(int item, int &Index);
 	HIDESBASE void __fastcall Insert(int Index, const int item);
 	void __fastcall InsertObject(int Index, const int item, System::TObject* AObject);
@@ -135,6 +137,7 @@ class PASCALIMPLEMENTATION TALIntegerList : public TALBaseQuickSortList
 	int __fastcall Push(int Item);
 	int __fastcall Pop(void);
 	int __fastcall Peek(void);
+	System::DynamicArray<int> __fastcall ToArray(void);
 public:
 	/* TALBaseQuickSortList.Destroy */ inline __fastcall virtual ~TALIntegerList(void) { }
 
@@ -179,6 +182,8 @@ class PASCALIMPLEMENTATION TALCardinalList : public TALBaseQuickSortList
 	int __fastcall IndexOfObject(System::TObject* AObject);
 	int __fastcall Add(const unsigned Item);
 	int __fastcall AddObject(const unsigned Item, System::TObject* AObject);
+	bool __fastcall TryAdd(const unsigned Item);
+	bool __fastcall TryAddObject(const unsigned Item, System::TObject* AObject);
 	bool __fastcall Find(unsigned item, int &Index);
 	HIDESBASE void __fastcall Insert(int Index, const unsigned item);
 	void __fastcall InsertObject(int Index, const unsigned item, System::TObject* AObject);
@@ -188,6 +193,7 @@ class PASCALIMPLEMENTATION TALCardinalList : public TALBaseQuickSortList
 	unsigned __fastcall Push(unsigned Item);
 	unsigned __fastcall Pop(void);
 	unsigned __fastcall Peek(void);
+	System::DynamicArray<unsigned> __fastcall ToArray(void);
 public:
 	/* TALBaseQuickSortList.Destroy */ inline __fastcall virtual ~TALCardinalList(void) { }
 
@@ -232,6 +238,8 @@ class PASCALIMPLEMENTATION TALInt64List : public TALBaseQuickSortList
 	int __fastcall IndexOfObject(System::TObject* AObject);
 	int __fastcall Add(const __int64 Item);
 	int __fastcall AddObject(const __int64 Item, System::TObject* AObject);
+	bool __fastcall TryAdd(const __int64 Item);
+	bool __fastcall TryAddObject(const __int64 Item, System::TObject* AObject);
 	bool __fastcall Find(__int64 item, int &Index);
 	HIDESBASE void __fastcall Insert(int Index, const __int64 item);
 	void __fastcall InsertObject(int Index, const __int64 item, System::TObject* AObject);
@@ -241,6 +249,7 @@ class PASCALIMPLEMENTATION TALInt64List : public TALBaseQuickSortList
 	__int64 __fastcall Push(__int64 Item);
 	__int64 __fastcall Pop(void);
 	__int64 __fastcall Peek(void);
+	System::DynamicArray<__int64> __fastcall ToArray(void);
 public:
 	/* TALBaseQuickSortList.Destroy */ inline __fastcall virtual ~TALInt64List(void) { }
 
@@ -285,6 +294,8 @@ class PASCALIMPLEMENTATION TALNativeIntList : public TALBaseQuickSortList
 	int __fastcall IndexOfObject(System::TObject* AObject);
 	int __fastcall Add(const NativeInt Item);
 	int __fastcall AddObject(const NativeInt Item, System::TObject* AObject);
+	bool __fastcall TryAdd(const NativeInt Item);
+	bool __fastcall TryAddObject(const NativeInt Item, System::TObject* AObject);
 	bool __fastcall Find(NativeInt item, int &Index);
 	HIDESBASE void __fastcall Insert(int Index, const NativeInt item);
 	void __fastcall InsertObject(int Index, const NativeInt item, System::TObject* AObject);
@@ -294,6 +305,7 @@ class PASCALIMPLEMENTATION TALNativeIntList : public TALBaseQuickSortList
 	NativeInt __fastcall Push(NativeInt Item);
 	NativeInt __fastcall Pop(void);
 	NativeInt __fastcall Peek(void);
+	System::DynamicArray<NativeInt> __fastcall ToArray(void);
 public:
 	/* TALBaseQuickSortList.Destroy */ inline __fastcall virtual ~TALNativeIntList(void) { }
 
@@ -338,6 +350,8 @@ class PASCALIMPLEMENTATION TALDoubleList : public TALBaseQuickSortList
 	int __fastcall IndexOfObject(System::TObject* AObject);
 	int __fastcall Add(const double Item);
 	int __fastcall AddObject(const double Item, System::TObject* AObject);
+	bool __fastcall TryAdd(const double Item);
+	bool __fastcall TryAddObject(const double Item, System::TObject* AObject);
 	bool __fastcall Find(double item, int &Index);
 	HIDESBASE void __fastcall Insert(int Index, const double item);
 	void __fastcall InsertObject(int Index, const double item, System::TObject* AObject);
@@ -347,6 +361,7 @@ class PASCALIMPLEMENTATION TALDoubleList : public TALBaseQuickSortList
 	double __fastcall Push(double Item);
 	double __fastcall Pop(void);
 	double __fastcall Peek(void);
+	System::DynamicArray<double> __fastcall ToArray(void);
 public:
 	/* TALBaseQuickSortList.Destroy */ inline __fastcall virtual ~TALDoubleList(void) { }
 

diff --git a/source/hpp/Win32/tokyo/ALString.hpp b/source/hpp/Win32/tokyo/ALString.hpp
@@ -559,6 +559,7 @@ extern DELPHI_PACKAGE System::AnsiString __fastcall ALGUIDToByteString(const GUI
 extern DELPHI_PACKAGE System::AnsiString __fastcall ALNewGUIDByteString(void);
 extern DELPHI_PACKAGE System::AnsiString __fastcall ALGUIDToString(const GUID &Guid, const bool WithoutBracket = false, const bool WithoutHyphen = false);
 extern DELPHI_PACKAGE System::AnsiString __fastcall ALNewGUIDString(const bool WithoutBracket = false, const bool WithoutHyphen = false);
+extern DELPHI_PACKAGE System::DynamicArray<System::Byte> __fastcall ALNewGUIDBytes(void);
 extern DELPHI_PACKAGE System::UnicodeString __fastcall ALGUIDToStringU(const GUID &Guid, const bool WithoutBracket = false, const bool WithoutHyphen = false);
 extern DELPHI_PACKAGE System::UnicodeString __fastcall ALNewGUIDStringU(const bool WithoutBracket = false, const bool WithoutHyphen = false);
 extern DELPHI_PACKAGE bool __fastcall ALMatchesMask(const System::AnsiString Filename, const System::AnsiString Mask);