Browse Source

* Try to fix Browser issues

git-svn-id: trunk@6011 -
pierre 18 years ago
parent
commit
4641d6d4c6
1 changed files with 19 additions and 15 deletions
  1. 19 15
      ide/fpsymbol.pas

+ 19 - 15
ide/fpsymbol.pas

@@ -196,7 +196,7 @@ type
       ReferenceView : PSymbolReferenceView;
       ReferenceView : PSymbolReferenceView;
 {$ifdef HASOUTLINE}
 {$ifdef HASOUTLINE}
       InheritanceView: PSymbolInheritanceView;
       InheritanceView: PSymbolInheritanceView;
-{$endif HASOUTLIEN}
+{$endif HASOUTLINE}
       MemInfoView   : PSymbolMemInfoView;
       MemInfoView   : PSymbolMemInfoView;
       UnitInfoText  : PSymbolMemoView;
       UnitInfoText  : PSymbolMemoView;
       UnitInfoUsed  : PSymbolScopeView;
       UnitInfoUsed  : PSymbolScopeView;
@@ -1223,7 +1223,8 @@ function TBrowserTab.GetItem(Index: sw_integer): PBrowserTabItem;
 var Counter: integer;
 var Counter: integer;
     P: PBrowserTabItem;
     P: PBrowserTabItem;
 begin
 begin
-  P:=Items; Counter:=0;
+  P:=Items;
+  Counter:=0;
   while (P<>nil) and (Counter<Index) do
   while (P<>nil) and (Counter<Index) do
     begin
     begin
       P:=P^.Next;
       P:=P^.Next;
@@ -1294,7 +1295,8 @@ begin
       begin
       begin
         DontClear:=false; Idx:=-1;
         DontClear:=false; Idx:=-1;
         for I:=0 to GetItemCount-1 do
         for I:=0 to GetItemCount-1 do
-          if GetCtrlCode(GetItem(I)^.Sign)=Event.KeyCode then
+          if (GetCtrlCode(GetItem(I)^.Sign)=Event.KeyCode){ or
+             (GetItem(I)^.Sign=UpCase(Event.CharCode))}  then
            if (Flags and (1 shl I))<>0 then
            if (Flags and (1 shl I))<>0 then
             begin
             begin
               Idx:=I;
               Idx:=I;
@@ -1509,22 +1511,21 @@ begin
     NewBrowserTabItem(label_browsertab_reference,ReferenceView,
     NewBrowserTabItem(label_browsertab_reference,ReferenceView,
 {$ifdef HASOUTLINE}
 {$ifdef HASOUTLINE}
     NewBrowserTabItem(label_browsertab_inheritance,InheritanceView,
     NewBrowserTabItem(label_browsertab_inheritance,InheritanceView,
-{$endif HASOUTLINE}
+{$else not  HASOUTLINE}
+    NewBrowserTabItem(label_browsertab_inheritance,nil,
+{$endif not HASOUTLINE}
     NewBrowserTabItem(label_browsertab_memory,MemInfoView,
     NewBrowserTabItem(label_browsertab_memory,MemInfoView,
     NewBrowserTabItem(label_browsertab_unit,UnitInfo,
     NewBrowserTabItem(label_browsertab_unit,UnitInfo,
-    nil))
-{$ifdef HASOUTLINE}
-    )
-{$endif HASOUTLINE}
-    ))));
+    nil)))))));
   PageTab^.GrowMode:=gfGrowHiX;
   PageTab^.GrowMode:=gfGrowHiX;
   Insert(PageTab);
   Insert(PageTab);
 
 
   if assigned(ScopeView) then
   if assigned(ScopeView) then
    SelectTab(btScope)
    SelectTab(btScope)
-  else
-   if assigned(ReferenceView) then
+  else if assigned(ReferenceView) then
     SelectTab(btReferences)
     SelectTab(btReferences)
+  else if assigned(MemInfoView) then
+    SelectTab(btMemInfo)
 {$ifdef HASOUTLINE}
 {$ifdef HASOUTLINE}
   else
   else
    if assigned(InheritanceView) then
    if assigned(InheritanceView) then
@@ -1700,17 +1701,20 @@ end;
 
 
 procedure TBrowserWindow.SelectTab(BrowserTab: Sw_integer);
 procedure TBrowserWindow.SelectTab(BrowserTab: Sw_integer);
 var Tabs: Sw_integer;
 var Tabs: Sw_integer;
-{    PB : PBreakpoint;
+    PB : PBreakpoint;
     PS :PString;
     PS :PString;
-    l : longint; }
+    l : longint;
 begin
 begin
-(*  case BrowserTab of
+  case BrowserTab of
     btScope :
     btScope :
       if assigned(ScopeView) then
       if assigned(ScopeView) then
         ScopeView^.Select;
         ScopeView^.Select;
     btReferences :
     btReferences :
       if assigned(ReferenceView) then
       if assigned(ReferenceView) then
         ReferenceView^.Select;
         ReferenceView^.Select;
+    btMemInfo:
+      if assigned(MemInfoView) then
+        MemInfoView^.Select;
     btBreakWatch :
     btBreakWatch :
       begin
       begin
         if Assigned(Sym) then
         if Assigned(Sym) then
@@ -1768,7 +1772,7 @@ begin
         end;
         end;
       end;
       end;
 
 
-  end;*)
+  end;
   Tabs:=0;
   Tabs:=0;
   if assigned(ScopeView) then
   if assigned(ScopeView) then
     Tabs:=Tabs or (1 shl btScope);
     Tabs:=Tabs or (1 shl btScope);