paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-03 22:30:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* duplicate names fixed

Browse Source 
git-svn-id: trunk@2436 -
This commit is contained in:
peter 2006-02-05 01:55:44 +00:00
parent 611150522f
commit c3d89885c2
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fv/dialogs.pas
View File

@ -1335,11 +1335,11 @@ END;
{---------------------------------------------------------------------------}
FUNCTION TInputLine.Valid (Command: Word): Boolean;
FUNCTION AppendError (Validator: PValidator): Boolean;
FUNCTION AppendError (AValidator: PValidator): Boolean;
BEGIN
AppendError := False; { Preset false }
If (Data <> Nil) Then
With Validator^ Do
With AValidator^ Do
If (Options AND voOnAppend <> 0) AND { Check options }
(CurPos <> Length(Data^)) AND { Exceeds max length }
NOT IsValidInput(Data^, True) Then Begin { Check data valid }

18
fv/menus.pas
View File

@ -430,10 +430,10 @@ END;
CONSTRUCTOR TMenuView.Load (Var S: TStream);
FUNCTION DoLoadMenu: PMenu;
VAR Tok: Byte; Item: PMenuItem; Last: ^PMenuItem; Menu: PMenu;
VAR Tok: Byte; Item: PMenuItem; Last: ^PMenuItem; HMenu: PMenu;
BEGIN
New(Menu); { Create new menu }
Last := @Menu^.Items; { Start on first item }
New(HMenu); { Create new menu }
Last := @HMenu^.Items; { Start on first item }
Item := Nil; { Clear pointer }
S.Read(Tok, SizeOf(Tok)); { Read token }
While (Tok <> 0) Do Begin
@ -460,8 +460,8 @@ CONSTRUCTOR TMenuView.Load (Var S: TStream);
S.Read(Tok, SizeOf(Tok)); { Read token }
End;
Last^ := Nil; { List complete }
Menu^.Default := Menu^.Items; { Set menu default }
DoLoadMenu := Menu; { Return menu }
HMenu^.Default := HMenu^.Items; { Set menu default }
DoLoadMenu := HMenu; { Return menu }
End;
BEGIN
@ -772,11 +772,11 @@ END;
{---------------------------------------------------------------------------}
PROCEDURE TMenuView.Store (Var S: TStream);
PROCEDURE DoStoreMenu (Menu: PMenu);
PROCEDURE DoStoreMenu (AMenu: PMenu);
VAR Item: PMenuItem; Tok: Byte;
BEGIN
Tok := $FF; { Preset max count }
Item := Menu^.Items; { Start first item }
Item := AMenu^.Items; { Start first item }
While (Item <> Nil) Do Begin
With Item^ Do Begin
S.Write(Tok, SizeOf(Tok)); { Write tok value }
@ -806,10 +806,10 @@ END;
PROCEDURE TMenuView.HandleEvent (Var Event: TEvent);
VAR CallDraw: Boolean; P: PMenuItem;
PROCEDURE UpdateMenu (Menu: PMenu);
PROCEDURE UpdateMenu (AMenu: PMenu);
VAR P: PMenuItem; CommandState: Boolean;
BEGIN
P := Menu^.Items; { Start on first item }
P := AMenu^.Items; { Start on first item }
While (P <> Nil) Do Begin
If (P^.Name <> Nil) Then { Valid name }
If (P^.Command = 0) Then UpdateMenu(P^.SubMenu){ Update menu }