From fb71fcc7f92294418de096b84849bf7cb4274a5a Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 21 Nov 2004 20:53:26 +0000
Subject: [PATCH]   * fixed breakpoint dialog

---
 ide/fpconst.pas |  8 ++++++--
 ide/fpdebug.pas | 18 ++++++++++++++----
 ide/fpstre.inc  |  7 +++++--
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ide/fpconst.pas b/ide/fpconst.pas
index 9a2c09c63e..88da4c5238 100644
--- a/ide/fpconst.pas
+++ b/ide/fpconst.pas
@@ -141,8 +141,9 @@ const
      hidConditionalDefines= 205;
      hidCompilerArgs      = 206;
      hidWatchDialog       = 207;
-     hidBreakpointDialog  = 208;
+     hidBreakpointDialogName = 208;
      hidRunDir            = 209;
+     hidBreakpointDialogCond = 210;
 
      { Command constants }
      cmShowClipboard     = 201;
@@ -471,7 +472,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.16  2004-11-20 14:21:19  florian
+  Revision 1.17  2004-11-21 20:53:26  peter
+    * fixed breakpoint dialog
+
+  Revision 1.16  2004/11/20 14:21:19  florian
     * implemented reload menu item
     * increased file history to 9 files
 
diff --git a/ide/fpdebug.pas b/ide/fpdebug.pas
index b3525ec8fc..cc6f8464a2 100644
--- a/ide/fpdebug.pas
+++ b/ide/fpdebug.pas
@@ -1949,6 +1949,10 @@ begin
       begin
         DontClear:=false;
         case Event.KeyCode of
+	  kbEnd :
+	    FocusItem(List^.Count-1);
+	  kbHome :
+	    FocusItem(0);
           kbEnter :
             Message(@Self,evCommand,cmMsgGotoSource,nil);
           kbIns :
@@ -2420,12 +2424,15 @@ begin
   Inc(R.A.Y); R.B.Y:=R.A.Y+1; R.B.X:=R.B.X-3;
   New(NameIL, Init(R, 255)); Insert(NameIL);
   R2.Copy(R); R2.A.X:=R2.B.X; R2.B.X:=R2.A.X+3;
-  Insert(New(PHistory, Init(R2, NameIL, hidWatchDialog)));
+  Insert(New(PHistory, Init(R2, NameIL, hidBreakPointDialogName)));
   R.Copy(R3); Inc(R.A.Y); R.B.Y:=R.A.Y+1;
   R2.Copy(R); R2.Move(-1,-1);
   Insert(New(PLabel, Init(R2, label_breakpoint_name, NameIL)));
   R.Move(0,3);
+  R.B.X:=R.B.X-3;
   New(ConditionsIL, Init(R, 255)); Insert(ConditionsIL);
+  R2.Copy(R); R2.A.X:=R2.B.X; R2.B.X:=R2.A.X+3;
+  Insert(New(PHistory, Init(R2, ConditionsIL, hidBreakPointDialogCond)));
   R2.Copy(R); R2.Move(-1,-1); Insert(New(PLabel, Init(R2, label_breakpoint_conditions, ConditionsIL)));
   R.Move(0,3); R.B.X:=R.A.X+36;
   New(LineIL, Init(R, 128)); Insert(LineIL);
@@ -2454,12 +2461,12 @@ begin
 end;
 
 function TBreakpointItemDialog.Execute: Word;
-var R: word;
+var R: sw_word;
     S1: string;
     err: word;
     L: longint;
 begin
-  R:=longint(Breakpoint^.typ);
+  R:=sw_word(Breakpoint^.typ);
   TypeRB^.SetData(R);
 
   If Breakpoint^.typ=bt_file_line then
@@ -3636,7 +3643,10 @@ end.
 
 {
   $Log$
-  Revision 1.55  2004-11-11 15:20:52  florian
+  Revision 1.56  2004-11-21 20:53:26  peter
+    * fixed breakpoint dialog
+
+  Revision 1.55  2004/11/11 15:20:52  florian
     * applied Peter's patch from yesterday
 
   Revision 1.54  2004/11/08 21:55:09  peter
diff --git a/ide/fpstre.inc b/ide/fpstre.inc
index 4e32f0a1b4..3129a0eb92 100644
--- a/ide/fpstre.inc
+++ b/ide/fpstre.inc
@@ -306,7 +306,7 @@ const
       dialog_modifynewbreakpoint = 'Modify/New Breakpoint';
       label_breakpoint_name = '~N~ame';
       label_breakpoint_line = '~L~ine';
-      label_breakpoint_conditions = 'Conditions';
+      label_breakpoint_conditions = '~C~onditions';
       label_breakpoint_ignorecount = '~I~gnore count';
       label_breakpoint_type = '~T~ype';
 
@@ -1058,7 +1058,10 @@ const
 
 {
   $Log$
-  Revision 1.23  2004-11-20 14:21:19  florian
+  Revision 1.24  2004-11-21 20:53:26  peter
+    * fixed breakpoint dialog
+
+  Revision 1.23  2004/11/20 14:21:19  florian
     * implemented reload menu item
     * increased file history to 9 files