Merge branch 'a11_2_a12'

This commit is contained in:
Basile Burg 2015-01-30 15:43:40 +01:00
commit 70a4fe5327
3 changed files with 5 additions and 3 deletions

View File

@ -225,8 +225,8 @@ type
property Sources: TStringList read fExtraSrcs write setSrcs stored false; deprecated;
property exclusions: TStringList read fExcl write setExcl;
property extraSources: TStringList read fExtraSrcs write setSrcs;
property includes: TStringList read fIncl write setIncl; deprecated;
property imports: TStringList read fImpt write setImpt; deprecated;
property includes: TStringList read fIncl write setIncl stored false; deprecated;
property imports: TStringList read fImpt write setImpt stored false; deprecated;
property importModulePaths: TStringList read fIncl write setIncl;
property importStringPaths: TStringList read fImpt write setImpt;
public

View File

@ -234,6 +234,7 @@ begin
macRecorder.Editor := fDoc;
fSyncEdit.Editor := fDoc;
completion.Editor := fDoc;
//TODO-cbugfix: prevent completion to steal the focus, this trigs too much updates after Ctrl+Space
if (pageControl.ActivePage.Caption = '') then
begin
fKeyChanged := true;
@ -249,6 +250,7 @@ end;
procedure TCEEditorWidget.completionExecute(Sender: TObject);
begin
getCompletionList;
completion.TheForm.Font.Size := fDoc.Font.Size;
end;
procedure TCEEditorWidget.completionCodeCompletion(var Value: string;

View File

@ -110,7 +110,7 @@ end;
procedure TCELibManEditorWidget.btnRemLibClick(Sender: TObject);
begin
if List.Selected = nil then exit;
List.Items.Delete( List.Selected.Index );
List.Items.Delete(List.Selected.Index);
gridToData;
end;