paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 11:59:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

using ChildSizing for com opts dlg page code

Browse Source 
git-svn-id: trunk@9189 -
This commit is contained in:
mattias 2006-04-26 08:41:42 +00:00
parent 6f9e11bc79
commit fffbb42dec
3 changed files with 47 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/opengl/glgtkglxcontext.pas
View File

@ -749,6 +749,7 @@ var
Add(GDK_GL_GREEN_SIZE); Add(1); Add(GDK_GL_GREEN_SIZE); Add(1);
Add(GDK_GL_BLUE_SIZE); Add(1); Add(GDK_GL_BLUE_SIZE); Add(1);
Add(GDK_GL_DEPTH_SIZE); Add(1); Add(GDK_GL_DEPTH_SIZE); Add(1);
Add(GDK_GL_STENCIL_SIZE); Add(1);
Add(GDK_GL_None); Add(GDK_GL_None);
end; end;

121
ide/compileroptionsdlg.pp
View File

@ -370,41 +370,45 @@ begin
Page:=0; Page:=0;
{ Search Paths Tab } DisableAlign;
SetupSearchPathsTab(Page); try
inc(Page); { Search Paths Tab }
SetupSearchPathsTab(Page);
inc(Page);
{ Parsing Tab } { Parsing Tab }
SetupParsingTab(Page); SetupParsingTab(Page);
inc(Page); inc(Page);
{ Code Generation Tab } { Code Generation Tab }
SetupCodeGenerationTab(Page); SetupCodeGenerationTab(Page);
inc(Page); inc(Page);
{ Linking Tab } { Linking Tab }
SetupLinkingTab(Page); SetupLinkingTab(Page);
inc(Page); inc(Page);
{ Messages Tab } { Messages Tab }
SetupMessagesTab(Page); SetupMessagesTab(Page);
inc(Page); inc(Page);
{ Other Tab } { Other Tab }
SetupOtherTab(Page); SetupOtherTab(Page);
inc(Page); inc(Page);
{ Inherited Tab } { Inherited Tab }
SetupInheritedTab(Page); SetupInheritedTab(Page);
inc(Page); inc(Page);
{ Compilation Tab } { Compilation Tab }
SetupCompilationTab(Page); SetupCompilationTab(Page);
inc(Page); inc(Page);
{ Bottom Buttons }
SetupButtonBar;
{ Bottom Buttons }
SetupButtonBar;
finally
EnableAlign;
end;
//TODO: MWE: Are these still needed ? //TODO: MWE: Are these still needed ?
// can't we just use a Doxxx portected method ? // can't we just use a Doxxx portected method ?
@ -1365,12 +1369,10 @@ begin
end; end;
{------------------------------------------------------------------------------} {------------------------------------------------------------------------------
{ TfrmCompilerOptions SetupCodeGenerationTab } TfrmCompilerOptions SetupCodeGenerationTab
{------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
procedure TfrmCompilerOptions.SetupCodeGenerationTab(Page: integer); procedure TfrmCompilerOptions.SetupCodeGenerationTab(Page: integer);
var
w: Integer;
begin begin
// Setup the Code Generation Tab // Setup the Code Generation Tab
CodeGenPage:=nbMain.Page[Page]; CodeGenPage:=nbMain.Page[Page];
@ -1384,6 +1386,7 @@ begin
Height := 80; Height := 80;
Width := 150; Width := 150;
Caption := dlgCOUnitStyle; Caption := dlgCOUnitStyle;
ChildSizing.Layout:=cclTopToBottomThenLeftToRight;
end; end;
chkSmartLinkUnit := TCheckBox.Create(Self); chkSmartLinkUnit := TCheckBox.Create(Self);
@ -1391,9 +1394,6 @@ begin
begin begin
Parent := grpSmartLinkUnit; Parent := grpSmartLinkUnit;
Caption := dlgCOSmartLinkable + ' (-CX)'; Caption := dlgCOSmartLinkable + ' (-CX)';
Top := 5;
Left := 5;
Width := Parent.ClientWidth-13;
end; end;
{------------------------------------------------------------} {------------------------------------------------------------}
@ -1406,6 +1406,8 @@ begin
Height := 80; Height := 80;
Width := 210; Width := 210;
Caption := dlgCOChecks; Caption := dlgCOChecks;
ChildSizing.Layout:=cclTopToBottomThenLeftToRight;
ChildSizing.ControlsPerLine:=2;
end; end;
chkChecksIO := TCheckBox.Create(Self); chkChecksIO := TCheckBox.Create(Self);
@ -1413,9 +1415,6 @@ begin
begin begin
Parent := grpChecks; Parent := grpChecks;
Caption := 'I/O (-Ci)'; Caption := 'I/O (-Ci)';
Top := 2;
Left := 2;
Width := 100;
end; end;
chkChecksRange := TCheckBox.Create(Self); chkChecksRange := TCheckBox.Create(Self);
@ -1423,9 +1422,6 @@ begin
begin begin
Parent := grpChecks; Parent := grpChecks;
Caption := dlgCORange+' (-Cr)'; Caption := dlgCORange+' (-Cr)';
Top := 2;
Left := 102;
Width := 100;
end; end;
chkChecksOverflow := TCheckBox.Create(Self); chkChecksOverflow := TCheckBox.Create(Self);
@ -1433,9 +1429,6 @@ begin
begin begin
Parent := grpChecks; Parent := grpChecks;
Caption := dlgCOOverflow+' (-Co)'; Caption := dlgCOOverflow+' (-Co)';
Top := 27;
Left := 2;
Width := 100;
end; end;
chkChecksStack := TCheckBox.Create(Self); chkChecksStack := TCheckBox.Create(Self);
@ -1443,9 +1436,6 @@ begin
begin begin
Parent := grpChecks; Parent := grpChecks;
Caption := dlgCOStack+' (-Ct)'; Caption := dlgCOStack+' (-Ct)';
Top := 27;
Left := 102;
Width := 100;
end; end;
{------------------------------------------------------------} {------------------------------------------------------------}
@ -1459,6 +1449,7 @@ begin
Height := 55; Height := 55;
Width := 100; Width := 100;
Caption := dlgHeapSize +' (-Ch):'; Caption := dlgHeapSize +' (-Ch):';
ChildSizing.Layout:=cclTopToBottomThenLeftToRight;
end; end;
edtHeapSize := TEdit.Create(grpHeapSize); edtHeapSize := TEdit.Create(grpHeapSize);
@ -1466,10 +1457,7 @@ begin
begin begin
Parent := grpHeapSize; Parent := grpHeapSize;
Caption := dlgHeapSize; Caption := dlgHeapSize;
Top := 8; BorderSpacing.Around:=3;
Left := 5;
Height := 23;
Width := 65;
Text := ''; Text := '';
end; end;
@ -1484,15 +1472,13 @@ begin
Height := 100; Height := 100;
Width := 150; Width := 150;
Caption := dlgCOGenerate; Caption := dlgCOGenerate;
ChildSizing.Layout:=cclLeftToRightThenTopToBottom;
end; end;
radGenNormal := TRadioButton.Create(grpGenerate); radGenNormal := TRadioButton.Create(grpGenerate);
with radGenNormal do with radGenNormal do
begin begin
Parent := grpGenerate; Parent := grpGenerate;
Top := 5;
Left := 5;
Width := 140;
Caption := dlgCONormal+' (none)'; Caption := dlgCONormal+' (none)';
end; end;
@ -1500,9 +1486,6 @@ begin
with radGenFaster do with radGenFaster do
begin begin
Parent := grpGenerate; Parent := grpGenerate;
Top := 28;
Left := 5;
Width := 140;
Caption := dlgCOFast+' (-OG)'; Caption := dlgCOFast+' (-OG)';
end; end;
@ -1510,9 +1493,6 @@ begin
with radGenSmaller do with radGenSmaller do
begin begin
Parent := grpGenerate; Parent := grpGenerate;
Top := 51;
Left := 5;
Width := 140;
Caption := dlgCOSmaller+' (-Og)'; Caption := dlgCOSmaller+' (-Og)';
end; end;
@ -1635,17 +1615,15 @@ begin
Height := 150; Height := 150;
Width := 360; Width := 360;
Caption := dlgOptimiz; Caption := dlgOptimiz;
ChildSizing.Layout:=cclLeftToRightThenTopToBottom;
AutoSize:=true;
end; end;
w:=(grpOptimizations.Width-10);
radOptLevelNone := TRadioButton.Create(grpOptimizations); radOptLevelNone := TRadioButton.Create(grpOptimizations);
with radOptLevelNone do with radOptLevelNone do
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgLevelNoneOpt+' (none)'; Caption := dlgLevelNoneOpt+' (none)';
Top := 5;
Left := 5;
Width := w;
end; end;
radOptLevel1 := TRadioButton.Create(grpOptimizations); radOptLevel1 := TRadioButton.Create(grpOptimizations);
@ -1653,9 +1631,6 @@ begin
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgLevel1Opt+' (-O1)'; Caption := dlgLevel1Opt+' (-O1)';
Top := 26;
Left := 5;
Width := w;
end; end;
radOptLevel2 := TRadioButton.Create(grpOptimizations); radOptLevel2 := TRadioButton.Create(grpOptimizations);
@ -1663,9 +1638,6 @@ begin
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgLevel2Opt+' (-O2)'; Caption := dlgLevel2Opt+' (-O2)';
Top := 47;
Left := 5;
Width := w;
end; end;
radOptLevel3 := TRadioButton.Create(grpOptimizations); radOptLevel3 := TRadioButton.Create(grpOptimizations);
@ -1673,9 +1645,6 @@ begin
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgLevel3Opt+' (-O3)'; Caption := dlgLevel3Opt+' (-O3)';
Top := 68;
Left := 5;
Width := w;
end; end;
chkOptVarsInReg := TCheckBox.Create(Self); chkOptVarsInReg := TCheckBox.Create(Self);
@ -1683,9 +1652,6 @@ begin
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgCOKeepVarsReg+' (-Or)'; Caption := dlgCOKeepVarsReg+' (-Or)';
Top := 89;
Left := 5;
Width := w;
end; end;
chkOptUncertain := TCheckBox.Create(Self); chkOptUncertain := TCheckBox.Create(Self);
@ -1693,9 +1659,6 @@ begin
begin begin
Parent := grpOptimizations; Parent := grpOptimizations;
Caption := dlgUncertOpt+' (-Ou)'; Caption := dlgUncertOpt+' (-Ou)';
Top := 110;
Left := 5;
Width := w;
end; end;
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------

4
ide/frmsearch.pas
View File

@ -311,6 +311,8 @@ var
end; end;
ASearch:=copy(CurLine,Match,MatchLen); ASearch:=copy(CurLine,Match,MatchLen);
AReplace:=ReplaceText; AReplace:=ReplaceText;
if fRegExp then
AReplace:=RE.Substitute(AReplace);
SourceEditorWindow.ActiveEditor.AskReplace(Self,ASearch,AReplace, SourceEditorWindow.ActiveEditor.AskReplace(Self,ASearch,AReplace,
Line,Match,Action); Line,Match,Action);
case Action of case Action of
@ -322,7 +324,9 @@ var
exit; exit;
end; end;
end; end;
// TODO: create change text // TODO: create change text
end; end;
begin begin