From f531875607ffd14e3c3dc72ca304e3ff22356e1d Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 1 Jan 2013 11:43:22 +0000
Subject: [PATCH] IDE: update active sourceeditor on KeyDown

git-svn-id: trunk@39708 -
---
 ide/sourceeditor.pp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ide/sourceeditor.pp b/ide/sourceeditor.pp
index 05ccfcde68..9e4570f216 100644
--- a/ide/sourceeditor.pp
+++ b/ide/sourceeditor.pp
@@ -482,6 +482,7 @@ type
     procedure Activate;
     function PageIndex: integer;
     function IsActiveOnNoteBook: boolean;
+    procedure CheckActiveWindow;
 
     // debugging
     procedure DoRequestExecutionMarks(Data: PtrInt);
@@ -3170,10 +3171,7 @@ Begin
   FSharedValues.SetActiveSharedEditor(Self);
   Handled:=true;
 
-  if Manager.ActiveSourceWindow <> SourceNotebook then begin
-    debugln('Warning: ActiveSourceWindow is set incorrectly');
-    Manager.ActiveSourceWindow := SourceNotebook;
-  end;
+  CheckActiveWindow;
 
   case Command of
 
@@ -4840,7 +4838,8 @@ end;
 Procedure TSourceEditor.EditorKeyDown(Sender: TObject; var Key: Word; Shift :
   TShiftState);
 begin
-  //DebugLn('TSourceEditor.EditorKeyDown A ',dbgsName(Sender),' ',IntToStr(Key));
+  //DebugLn(['TSourceEditor.EditorKeyDown A ',dbgsName(Sender),' Key=',IntToStr(Key),' File=',ExtractFileName(Filename),' Wnd=',dbgSourceNoteBook(SourceNotebook)]);
+  CheckActiveWindow;
   if Assigned(OnKeyDown) then
     OnKeyDown(Sender, Key, Shift);
 end;
@@ -5135,6 +5134,13 @@ begin
     Result:=false;
 end;
 
+procedure TSourceEditor.CheckActiveWindow;
+begin
+  if Manager.ActiveSourceWindow = SourceNotebook then exit;
+  debugln('Warning: ActiveSourceWindow is set incorrectly Active=',dbgSourceNoteBook(Manager.ActiveSourceWindow),' Me=',dbgSourceNoteBook(SourceNotebook));
+  Manager.ActiveSourceWindow := SourceNotebook;
+end;
+
 procedure TSourceEditor.DoRequestExecutionMarks(Data: PtrInt);
 begin
   DebugBoss.LineInfo.Request(FSharedValues.MarksRequestedForFile);