Browse Source

o resolve #7277:
* fixed tab order on options/dirs./misc.
* tfpmemo sends esc now properly

git-svn-id: trunk@8821 -

florian 18 years ago
parent
commit
4235e9a00a
2 changed files with 20 additions and 2 deletions
  1. 15 1
      ide/fpmopts.inc
  2. 5 1
      ide/fpviews.pas

+ 15 - 1
ide/fpmopts.inc

@@ -698,7 +698,8 @@ var tab:Ptab;
     IL:array[0..11] of PEditorInputLine;
     misc_items:PTabItem;
     misc_tabfocus:Pview;
-
+    newmisc_items,
+    temp : PTabItem;
 const LW=25;
 
 begin
@@ -777,6 +778,19 @@ begin
         end;
     end;
 
+  { revert items for correct tab order }
+  newmisc_items:=nil;
+  while assigned(misc_items) do
+    begin
+      { get element }
+      temp:=misc_items;
+      misc_items:=temp^.next;
+      { put element }
+      temp^.next:=newmisc_items;
+      newmisc_items:=temp;
+    end;
+  misc_items:=newmisc_items;
+
   {Create some tabs in the window.}
   tabR.assign(1,1,d^.size.x-2,d^.size.y-1);
   new(tab,init(tabR,

+ 5 - 1
ide/fpviews.pas

@@ -4500,7 +4500,11 @@ begin
         DontClear:=false;
         case Event.KeyCode of
           kbEsc:
-            Message(Owner,evCommand,cmCancel,nil);
+            begin
+              Event.What:=evCommand;
+              Event.Command:=cmCancel;
+              PutEvent(Event);
+            end;
         else DontClear:=true;
         end;
         if not DontClear then ClearEvent(Event);