From: <aka...@us...> - 2024-06-23 13:09:07
|
Revision: 4274 http://sourceforge.net/p/gexperts/code/4274 Author: akalwahome Date: 2024-06-23 13:09:05 +0000 (Sun, 23 Jun 2024) Log Message: ----------- Merged from trunk Modified Paths: -------------- branches/dark-mode/Source/Framework/GX_About.pas branches/dark-mode/Source/Utils/GX_GenericUtils.pas Property Changed: ---------------- branches/dark-mode/ Index: branches/dark-mode =================================================================== --- branches/dark-mode 2024-06-16 16:39:06 UTC (rev 4273) +++ branches/dark-mode 2024-06-23 13:09:05 UTC (rev 4274) Property changes on: branches/dark-mode ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1 ## -/trunk:4085-4271 \ No newline at end of property +/trunk:4085-4273 \ No newline at end of property Modified: branches/dark-mode/Source/Framework/GX_About.pas =================================================================== --- branches/dark-mode/Source/Framework/GX_About.pas 2024-06-16 16:39:06 UTC (rev 4273) +++ branches/dark-mode/Source/Framework/GX_About.pas 2024-06-23 13:09:05 UTC (rev 4274) @@ -93,7 +93,7 @@ inherited; TControl_SetMinConstraints(Self); GxSetDefaultFont(Self); - + TControl_SetMinConstraints(Self); TLabel_MakeUrlLabel(lblWebPage); {$IF DECLARED(TfmFeedbackWizard)} Modified: branches/dark-mode/Source/Utils/GX_GenericUtils.pas =================================================================== --- branches/dark-mode/Source/Utils/GX_GenericUtils.pas 2024-06-16 16:39:06 UTC (rev 4273) +++ branches/dark-mode/Source/Utils/GX_GenericUtils.pas 2024-06-23 13:09:05 UTC (rev 4274) @@ -3602,12 +3602,19 @@ end; function GetUserLocalApplicationDataFolder: string; -{$if not defined(CSIDL_LOCAL_APPDATA)} +{$IF NOT defined(CSIDL_LOCAL_APPDATA)} const - CSIDL_LOCAL_APPDATA = $001c; { <user name>\Local Settings\Application Data (non roaming) } -{$ifend} + // <user name>\Local Settings\Application Data (non roaming), available only for Windows 2000 and up + CSIDL_LOCAL_APPDATA = $001C; +{$IFEND} begin - Result := GetSpecialFolderPath(CSIDL_LOCAL_APPDATA) + if CheckWin32Version(5, 0) then begin + // Windows 2000 and up + Result := GetSpecialFolderPath(CSIDL_LOCAL_APPDATA); + end else begin + // Windows 9x or Windows NT (Yes, there are people using this version even in 2024) + Result := GetUserApplicationDataFolder; + end; end; function RunningWindows: Boolean; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |