--- Merging r13538 through r13541 into '.':

U    ide\whtml.pas
U    ide\fpviews.pas
U    rtl\win\video.pp
U    compiler\symtype.pas

git-svn-id: branches/fixes_2_4@13542 -

compiler/symtype.pas

@@ -98,9 +98,9 @@ interface
       public
          fileinfo   : tfileposinfo;
          symoptions : tsymoptions;
-         visibility : tvisibility;
          refs       : longint;
          reflist    : TLinkedList;
+         visibility : tvisibility;
          isdbgwritten : boolean;
          constructor create(st:tsymtyp;const aname:string);
          destructor  destroy;override;

ide/fpviews.pas

@@ -3894,7 +3894,9 @@ begin
        end;
     W^.HelpCtx:=hcSourceWindow;
     Desktop^.Insert(W);
+    { this makes loading a lot slower and is not needed as far as I can see (FK)
     Message(Application,evBroadcast,cmUpdate,nil);
+    }
   end;
   PopStatus;
   IOpenEditorWindow:=W;
@@ -3986,7 +3988,7 @@ begin
  FindFirst(filename,anyfile,Srec);
  while (DosError=0) do
    begin
-     ITryToOpenFile(Bounds,dir+srec.name,CurX,CurY,tryexts,true,false);    
+     ITryToOpenFile(Bounds,dir+srec.name,CurX,CurY,tryexts,true,false);
      FindNext(srec);
    end;
   FindClose(srec);

ide/whtml.pas

@@ -120,7 +120,7 @@ Type
     TTopicLinkCollection = object(TStringCollection)
       procedure   Insert(Item: Pointer); virtual;
       function    At(Index: sw_Integer): PString;
-      function    AddItem(Item: string): integer;
+      function    AddItem(Item: string): sw_integer;
     end;
 
 function EncodeHTMLCtx(FileID: integer; LinkNo: word): longint;
@@ -901,7 +901,7 @@ begin
   At:=inherited At(Index);
 end;
 
-function TTopicLinkCollection.AddItem(Item: string): integer;
+function TTopicLinkCollection.AddItem(Item: string): sw_integer;
 var Idx: sw_integer;
 begin
   if Item='' then Idx:=-1 else

rtl/win/video.pp

@@ -536,7 +536,6 @@ begin
 end;
 
 procedure SysUpdateScreen(Force: Boolean);
-type TmpRec = Array[0..(1024*32) - 1] of TCharInfo;
 
 type WordRec = record
                   One, Two: Byte;
@@ -546,7 +545,7 @@ var
    BufSize,
    BufCoord    : COORD;
    WriteRegion : SMALL_RECT;
-   LineBuf     : ^TmpRec;
+   LineBuf     : Array[0..(1024*32) - 1] of TCharInfo;
    BufCounter  : Longint;
    LineCounter,
    ColCounter  : Longint;
@@ -585,7 +584,6 @@ begin
            Bottom := ScreenHeight-1;
            Right := ScreenWidth-1;
         end;
-      New(LineBuf);
       BufCounter := 0;
       x1:=ScreenWidth+1;
       x2:=-1;
@@ -608,13 +606,13 @@ begin
                       y2:=LineCounter;
                  end;
                if useunicodefunctions then
-                 LineBuf^[BufCounter].UniCodeChar := Widechar(mapcp850[WordRec(VideoBuf^[BufCounter]).One].unicode)
+                 LineBuf[BufCounter].UniCodeChar := Widechar(mapcp850[WordRec(VideoBuf^[BufCounter]).One].unicode)
                else
-                 LineBuf^[BufCounter].UniCodeChar := Widechar(WordRec(VideoBuf^[BufCounter]).One);
+                 LineBuf[BufCounter].UniCodeChar := Widechar(WordRec(VideoBuf^[BufCounter]).One);
                { If (WordRec(VideoBuf^[BufCounter]).Two and $80)<>0 then
                  LineBuf^[BufCounter].Attributes := $100+WordRec(VideoBuf^[BufCounter]).Two
                else }
-               LineBuf^[BufCounter].Attributes := WordRec(VideoBuf^[BufCounter]).Two;
+               LineBuf[BufCounter].Attributes := WordRec(VideoBuf^[BufCounter]).Two;
 
                Inc(BufCounter);
              end; { for }
@@ -650,10 +648,9 @@ begin
       writeln('Y2: ',y2);
       }
       if useunicodefunctions then
-        WriteConsoleOutputW(TextRec(Output).Handle, LineBuf, BufSize, BufCoord, WriteRegion)
+        WriteConsoleOutputW(TextRec(Output).Handle, @LineBuf, BufSize, BufCoord, WriteRegion)
       else
-        WriteConsoleOutput(TextRec(Output).Handle, LineBuf, BufSize, BufCoord, WriteRegion);
-      Dispose(LineBuf);
+        WriteConsoleOutput(TextRec(Output).Handle, @LineBuf, BufSize, BufCoord, WriteRegion);
 
       move(VideoBuf^,OldVideoBuf^,VideoBufSize);
    end;