[GExperts-Checkins] SF.net SVN: gexperts:[3086] trunk/ExternalSource/dzlib

[<tw...@us...>]

Revision: 3086
          http://sourceforge.net/p/gexperts/code/3086
Author:   twm
Date:     2020-04-18 12:52:42 +0000 (Sat, 18 Apr 2020)
Log Message:
-----------
updated to latest version from OSDN

Modified Paths:
--------------
    trunk/ExternalSource/dzlib/dzlib.inc
    trunk/ExternalSource/dzlib/u_dzMiscUtils.pas
    trunk/ExternalSource/dzlib/u_dzSelectDirectoryFix.pas
    trunk/ExternalSource/dzlib/u_dzVclUtils.pas

Modified: trunk/ExternalSource/dzlib/dzlib.inc
===================================================================
--- trunk/ExternalSource/dzlib/dzlib.inc	2020-04-18 09:08:05 UTC (rev 3085)
+++ trunk/ExternalSource/dzlib/dzlib.inc	2020-04-18 12:52:42 UTC (rev 3086)
@@ -31,8 +31,16 @@
 {$IFDEF DELPHI2006_UP}
 // TBitmap.SetSize was introduced with Delphi 2006
 {$DEFINE SUPPPORTS_BITMAP_SETSIZE}
+{$ENDIF}
+
+{$IFDEF DELPHI2006_UP}
+{$IFNDEF DELPHI2009_UP}
+// Delphi 2006 introduced an overloaded version of TDataSet.GetFields which takes a TWideStringList
+// parameter and deprecated the version that took TStrings. Delphi 2009 removed the deprecated
+// warning again because TStrings is Unicode.
 {$DEFINE DATASET_GETFIELDS_IS_WIDESTRINGLIST}
 {$ENDIF}
+{$ENDIF}
 
 {$IFDEF DELPHI7_UP}
 {$IFNDEF DELPHI_2009_UP}
@@ -61,6 +69,10 @@
 {$DEFINE MAXLISTSIZE_IS_DEPRECATED}
 {$ENDIF}
 
+{$IFDEF DELPHIXE6_UP}
+{$DEFINE JSONOBJECT_HAS_COUNT}
+{$ENDIF}
+
 {$IFDEF DELPHIX_TOKYO_UP}
 // this function probably already exist in earlier versions, I just run across a compile error for 10.2 Tokyo
 {$DEFINE HAS_INTTOHEX_FUNCTION}

Modified: trunk/ExternalSource/dzlib/u_dzMiscUtils.pas
===================================================================
--- trunk/ExternalSource/dzlib/u_dzMiscUtils.pas	2020-04-18 09:08:05 UTC (rev 3085)
+++ trunk/ExternalSource/dzlib/u_dzMiscUtils.pas	2020-04-18 12:52:42 UTC (rev 3086)
@@ -17,7 +17,6 @@
 unit u_dzMiscUtils;
 
 {$INCLUDE 'dzlib.inc'}
-{.$INCLUDE 'jedi.inc'}
 
 interface
 

Modified: trunk/ExternalSource/dzlib/u_dzSelectDirectoryFix.pas
===================================================================
--- trunk/ExternalSource/dzlib/u_dzSelectDirectoryFix.pas	2020-04-18 09:08:05 UTC (rev 3085)
+++ trunk/ExternalSource/dzlib/u_dzSelectDirectoryFix.pas	2020-04-18 12:52:42 UTC (rev 3086)
@@ -4,7 +4,6 @@
 unit u_dzSelectDirectoryFix;
 
 {$INCLUDE 'dzlib.inc'}
-{.$INCLUDE 'jedi.inc'}
 
 interface
 

Modified: trunk/ExternalSource/dzlib/u_dzVclUtils.pas
===================================================================
--- trunk/ExternalSource/dzlib/u_dzVclUtils.pas	2020-04-18 09:08:05 UTC (rev 3085)
+++ trunk/ExternalSource/dzlib/u_dzVclUtils.pas	2020-04-18 12:52:42 UTC (rev 3086)
@@ -5664,7 +5664,8 @@
       sl.Add(fn);
     end;
     DragFinish(_Msg.wParam);
-    doCallback(sl);
+    if cnt > 0 then
+      doCallback(sl);
   finally
     FreeAndNil(sl);
   end;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.