paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 14:20:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 49587 #df9663860c, 49599 #72a66051bf from trunk:

Browse Source 
IDE: Include compatibility information for compatibility with W8/W81/W10. Issue #0028435.
........
IDE: In "Needs building" dialog prevent a crash when text was typed in Combobox. Layout improvements. Issue #28456, patch from Alexey Torgashin.
........

git-svn-id: branches/fixes_1_4@49636 -
This commit is contained in:
maxim 2015-08-10 21:15:46 +00:00
parent 1cd1576a00
commit e587445d5d
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ide/ideinfoneedbuild.lfm
View File

@ -1,25 +1,26 @@
object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
Left = 275
Left = 522
Height = 434
Top = 248
Width = 555
Top = 232
Width = 655
BorderIcons = [biSystemMenu, biMaximize]
Caption = 'IDEInfoNeedBuildDlg'
ClientHeight = 434
ClientWidth = 555
ClientWidth = 655
OnClose = FormClose
OnCreate = FormCreate
OnDestroy = FormDestroy
OnKeyDown = FormKeyDown
Position = poScreenCenter
LCLVersion = '1.1'
LCLVersion = '1.5'
object TargetLabel: TLabel
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = TargetComboBox
AnchorSideTop.Side = asrCenter
Left = 6
Height = 15
Top = 12
Width = 65
Height = 17
Top = 13
Width = 80
BorderSpacing.Around = 6
Caption = 'TargetLabel'
ParentColor = False
@ -30,24 +31,24 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
AnchorSideTop.Control = Owner
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 77
Height = 27
Left = 92
Height = 31
Top = 6
Width = 472
Width = 557
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
ItemHeight = 0
OnChange = TargetComboBoxChange
Style = csDropDownList
TabOrder = 0
Text = 'TargetComboBox'
end
object MainMemo: TMemo
AnchorSideTop.Control = TargetComboBox
AnchorSideTop.Side = asrBottom
Left = 6
Height = 341
Top = 39
Width = 543
Height = 350
Top = 43
Width = 643
Align = alBottom
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Around = 6
@ -60,9 +61,9 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
end
object ButtonPanel1: TButtonPanel
Left = 6
Height = 42
Top = 386
Width = 543
Height = 29
Top = 399
Width = 643
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True
HelpButton.Name = 'HelpButton'
@ -73,5 +74,6 @@ object IDEInfoNeedBuildDlg: TIDEInfoNeedBuildDlg
CancelButton.DefaultCaption = True
TabOrder = 2
ShowButtons = [pbClose]
ShowBevel = False
end
end

18
ide/w32manifest.pas
View File

@ -37,7 +37,7 @@ unit W32Manifest;
interface
uses
Classes, SysUtils, FileUtil, Laz2_XMLCfg, Process, LCLProc, Controls, Forms,
Classes, SysUtils, FileUtil, Laz2_XMLCfg, LCLProc, Controls, Forms,
CodeToolManager, LazConf, LResources,
ProjectResourcesIntf, resource;
@ -97,7 +97,21 @@ const
' <requestedExecutionLevel level="%s" uiAccess="%s"/>'#$D#$A+
' </requestedPrivileges>'#$D#$A+
' </security>'#$D#$A+
' </trustInfo>'#$D#$A;
' </trustInfo>'#$D#$A+
' <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">'#$D#$A+
' <application>'#$D#$A+
' <!-- Windows Vista -->'#$D#$A+
' <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />'#$D#$A+
' <!-- Windows 7 -->'#$D#$A+
' <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />'#$D#$A+
' <!-- Windows 8 -->'#$D#$A+
' <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />'#$D#$A+
' <!-- Windows 8.1 -->'#$D#$A+
' <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />'#$D#$A+
' <!-- Windows 10 -->'#$D#$A+
' <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />'#$D#$A+
' </application>'#$D#$A+
' </compatibility>'#$D#$A;
sManifestFileDataEnd: String =
'</assembly>';
sManifestFileDataDpiAware: String =