ide: revert r17736 #7f533fe7dd since AssemblerDlg is committed now

git-svn-id: trunk@17751 -
This commit is contained in:
paul 2008-12-09 09:50:36 +00:00
parent df49c8ebd2
commit b37de6dfde

View File

@ -53,7 +53,7 @@ uses
MainBar, MainIntf, MainBase, BaseBuildManager, MainBar, MainIntf, MainBase, BaseBuildManager,
SourceMarks, SourceMarks,
DebuggerDlg, Watchesdlg, BreakPointsdlg, LocalsDlg, WatchPropertyDlg, DebuggerDlg, Watchesdlg, BreakPointsdlg, LocalsDlg, WatchPropertyDlg,
CallStackDlg, EvaluateDlg, RegistersDlg, {AssemblerDlg,} DBGOutputForm, CallStackDlg, EvaluateDlg, RegistersDlg, AssemblerDlg, DBGOutputForm,
GDBMIDebugger, SSHGDBMIDebugger, ProcessDebugger, GDBMIDebugger, SSHGDBMIDebugger, ProcessDebugger,
BaseDebugManager; BaseDebugManager;
@ -1324,10 +1324,9 @@ begin
mtInformation, [mbOK],0); mtInformation, [mbOK],0);
end; end;
FDebugger.FileName := ''; FDebugger.FileName := '';
{
if FDialogs[ddtAssembler] <> nil if FDialogs[ddtAssembler] <> nil
then TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(nil, 0); then TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(nil, 0);
}
end; end;
end; end;
@ -1384,12 +1383,11 @@ begin
end; end;
end; end;
{ if FDialogs[ddtAssembler] <> nil if FDialogs[ddtAssembler] <> nil
then begin then begin
TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(FDebugger, Alocation.Address); TAssemblerDlg(FDialogs[ddtAssembler]).SetLocation(FDebugger, Alocation.Address);
if SrcLine < 1 then Exit; if SrcLine < 1 then Exit;
end; end;
}
if not GetFullFilename(SrcFile, true) then exit; if not GetFullFilename(SrcFile, true) then exit;
@ -1452,7 +1450,7 @@ procedure TDebugManager.ViewDebugDialog(const ADialogType: TDebugDialogType);
const const
DEBUGDIALOGCLASS: array[TDebugDialogType] of TDebuggerDlgClass = ( DEBUGDIALOGCLASS: array[TDebugDialogType] of TDebuggerDlgClass = (
TDbgOutputForm, TBreakPointsDlg, TWatchesDlg, TLocalsDlg, TCallStackDlg, TDbgOutputForm, TBreakPointsDlg, TWatchesDlg, TLocalsDlg, TCallStackDlg,
TEvaluateDlg, TRegistersDlg, nil{TAssemblerDlg} TEvaluateDlg, TRegistersDlg, TAssemblerDlg
); );
var var
CurDialog: TDebuggerDlg; CurDialog: TDebuggerDlg;
@ -1548,11 +1546,11 @@ begin
end; end;
procedure TDebugManager.InitAssemblerDlg; procedure TDebugManager.InitAssemblerDlg;
{var var
TheDialog: TAssemblerDlg;} TheDialog: TAssemblerDlg;
begin begin
{ TheDialog := TAssemblerDlg(FDialogs[ddtAssembler]); TheDialog := TAssemblerDlg(FDialogs[ddtAssembler]);
TheDialog.SetLocation(FDebugger, FCurrentLocation.Address);} TheDialog.SetLocation(FDebugger, FCurrentLocation.Address);
end; end;
procedure TDebugManager.InitCallStackDlg; procedure TDebugManager.InitCallStackDlg;