diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm index 6489603b1e..74cf4cdd78 100644 --- a/ide/compileroptionsdlg.lfm +++ b/ide/compileroptionsdlg.lfm @@ -108,19 +108,6 @@ object frmCompilerOptions: TfrmCompilerOptions Caption = 'lblDebugPath' ParentColor = False end - object LCLWidgetTypeLabel: TLabel - AnchorSideLeft.Control = PathPage - AnchorSideTop.Control = edtDebugPath - AnchorSideTop.Side = asrBottom - Left = 6 - Height = 14 - Top = 258 - Width = 101 - BorderSpacing.Top = 6 - BorderSpacing.Around = 6 - Caption = 'LCLWidgetTypeLabel' - ParentColor = False - end object edtOtherUnits: TEdit AnchorSideLeft.Control = PathPage AnchorSideTop.Control = lblOtherUnits @@ -223,20 +210,6 @@ object frmCompilerOptions: TfrmCompilerOptions TabOrder = 5 Text = 'edtDebugPath' end - object LCLWidgetTypeComboBox: TComboBox - AnchorSideLeft.Control = LCLWidgetTypeLabel - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = LCLWidgetTypeLabel - AnchorSideTop.Side = asrCenter - Left = 113 - Height = 21 - Top = 255 - Width = 171 - BorderSpacing.Left = 6 - ItemHeight = 0 - Style = csDropDownList - TabOrder = 6 - end end object BuildModesPage: TTabSheet Caption = 'BuildModesPage' diff --git a/ide/compileroptionsdlg.pp b/ide/compileroptionsdlg.pp index a393b5a5e5..461bf9e018 100644 --- a/ide/compileroptionsdlg.pp +++ b/ide/compileroptionsdlg.pp @@ -84,9 +84,6 @@ type edtDebugPath: TEdit; DebugPathEditBtn: TPathEditorButton; - LCLWidgetTypeLabel: TLabel; - LCLWidgetTypeComboBox: TComboBox; - { Build modes } BuildModesPage: TTabSheet; @@ -604,11 +601,10 @@ end; procedure TfrmCompilerOptions.LoadOptionsToForm( SrcCompilerOptions: TBaseCompilerOptions); var - i: integer; - LCLPlatform: TLCLPlatform; EnabledLinkerOpts: Boolean; Options: TBaseCompilerOptions; HasBuildModes: boolean; + i: LongInt; begin if SrcCompilerOptions<>nil then Options:=SrcCompilerOptions @@ -635,12 +631,6 @@ begin edtUnitOutputDir.Text := Options.UnitOutputDirectory; edtDebugPath.Text := Options.DebugPath; - LCLPlatform := DirNameToLCLPlatform(Options.LCLWidgetType); - if CompareText(Options.LCLWidgetType,LCLPlatformDirNames[LCLPlatform])=0 then - LCLWidgetTypeComboBox.ItemIndex := ord(LCLPlatform)+1 - else - LCLWidgetTypeComboBox.ItemIndex := 0; - // build modes HasBuildModes:=(Options is TProjectCompilerOptions); if HasBuildModes then begin @@ -896,7 +886,6 @@ function TfrmCompilerOptions.SaveFormToOptions( var code: LongInt; hs: LongInt; - i: integer; NewTargetOS, NewTargetCPU: String; Options: TBaseCompilerOptions; @@ -970,13 +959,6 @@ begin if not CheckPutSearchPath('debugger search path',OldPath,Options.GetDebugPath(false)) then exit(false); - // ToDo: will be replaced by build macro - i:=LCLWidgetTypeComboBox.Itemindex; - if i<=0 then - Options.LCLWidgetType:='' - else - Options.LCLWidgetType:= LCLPlatformDirNames[TLCLPlatform(i-1)]; - // parsing Options.AssemblerStyle := grpAsmStyle.ItemIndex; @@ -1592,9 +1574,6 @@ end; TfrmCompilerOptions SetupSearchPathsTab ------------------------------------------------------------------------------} procedure TfrmCompilerOptions.SetupSearchPathsTab(Page: integer); -var - LCLInterface: TLCLPlatform; - s: String; begin // Setup the Search Paths Tab MainNoteBook.Page[Page].Caption:= dlgSearchPaths; @@ -1704,23 +1683,6 @@ begin Parent:=PathPage; end; edtDebugPath.AnchorToNeighbour(akRight,0,DebugPathEditBtn); - - {------------------------------------------------------------} - - LCLWidgetTypeLabel.Caption:=Format(lisCOVarious, [lisLCLWidgetType]); - with LCLWidgetTypeComboBox do begin - with Items do begin - BeginUpdate; - s:=LCLPlatformDisplayNames[GetDefaultLCLWidgetType]; - Add(Format(lisCOdefault,[s])); - for LCLInterface:=Low(TLCLPlatform) to High(TLCLPlatform) do begin - Items.Add(LCLPlatformDisplayNames[LCLInterface]); - end; - EndUpdate; - end; - ItemIndex:=1; - Constraints.MinWidth:=150; - end; end; procedure TfrmCompilerOptions.SetupBuildModesTab(Page: integer);