From 0b0d2192451a35107fe678d1b360057d1d1df5a0 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 22 Nov 2008 16:13:03 +0000 Subject: [PATCH] fixed some visibilities git-svn-id: trunk@17521 - --- ide/codeexplorer.pas | 2 +- ide/debugmanager.pas | 2 +- ide/main.pp | 2 +- ide/mainbase.pas | 3 ++- ide/mainintf.pas | 5 +++-- ide/unitdependencies.pas | 3 +-- lcl/controls.pp | 23 ++++++++++++----------- lcl/forms.pp | 17 ++++++++--------- lcl/lresources.pp | 4 ++-- lcl/menus.pp | 20 +++++++++++--------- 10 files changed, 42 insertions(+), 39 deletions(-) diff --git a/ide/codeexplorer.pas b/ide/codeexplorer.pas index fc81a59ca4..a103e27973 100644 --- a/ide/codeexplorer.pas +++ b/ide/codeexplorer.pas @@ -170,7 +170,6 @@ type procedure SetMode(AMode: TCodeExplorerMode); procedure UpdateMode; protected - procedure KeyUp(var Key: Word; Shift: TShiftState); override; procedure ApplyCodeFilter; procedure ApplyDirectivesFilter; function CompareCodeNodes(Node1, Node2: TTreeNode): integer; @@ -179,6 +178,7 @@ type procedure BeginUpdate; procedure EndUpdate; procedure CheckOnIdle; + procedure KeyUp(var Key: Word; Shift: TShiftState); override; procedure Refresh(OnlyVisible: boolean); procedure RefreshCode(OnlyVisible: boolean); procedure RefreshDirectives(OnlyVisible: boolean); diff --git a/ide/debugmanager.pas b/ide/debugmanager.pas index 0ad3b5a80e..9158265964 100644 --- a/ide/debugmanager.pas +++ b/ide/debugmanager.pas @@ -203,7 +203,6 @@ type procedure SetEnabled(const AValue: Boolean); override; procedure SetInitialEnabled(const AValue: Boolean); override; procedure SetExpression(const AValue: String); override; - procedure SetLocation(const ASource: String; const ALine: Integer); override; procedure SetSourceMark(const AValue: TSourceMark); procedure UpdateSourceMark; procedure UpdateSourceMarkImage; @@ -213,6 +212,7 @@ type procedure ResetMaster; function GetSourceLine: integer; override; procedure CopySourcePositionToBreakPoint; + procedure SetLocation(const ASource: String; const ALine: Integer); override; property SourceMark: TSourceMark read FSourceMark write SetSourceMark; end; diff --git a/ide/main.pp b/ide/main.pp index 3cdf7a6c73..cb957e1e82 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -533,7 +533,6 @@ type function OIHelpProvider: TAbstractIDEHTMLProvider; protected procedure SetToolStatus(const AValue: TIDEToolStatus); override; - function DoResetToolStatus(Interactive: boolean): boolean; override; procedure Notification(AComponent: TComponent; Operation: TOperation); override; @@ -676,6 +675,7 @@ type procedure CreateOftenUsedForms; override; procedure CreateSearchResultWindow; procedure UpdateDefaultPascalFileExtensions; + function DoResetToolStatus(Interactive: boolean): boolean; override; // files/units function DoNewFile(NewFileDescriptor: TProjectFileDescriptor; diff --git a/ide/mainbase.pas b/ide/mainbase.pas index 9241dd8d06..afe4fab373 100644 --- a/ide/mainbase.pas +++ b/ide/mainbase.pas @@ -79,7 +79,6 @@ type FToolStatus: TIDEToolStatus; protected FNeedUpdateHighlighters: boolean; - function GetMainBar: TComponent; override; function CreateMenuSeparator : TMenuItem; procedure CreateMenuItem(Section: TIDEMenuSection; @@ -118,6 +117,7 @@ type procedure OnMainBarDestroy(Sender: TObject); virtual; procedure ConnectOutputFilter; + public property ToolStatus: TIDEToolStatus read FToolStatus write SetToolStatus; function DoResetToolStatus(Interactive: boolean): boolean; virtual; abstract; @@ -126,6 +126,7 @@ type procedure StartIDE; virtual; abstract; destructor Destroy; override; procedure CreateOftenUsedForms; virtual; abstract; + function GetMainBar: TComponent; override; procedure GetUnitInfoForDesigner(ADesigner: TIDesigner; var ActiveSourceEditor: TSourceEditorInterface; diff --git a/ide/mainintf.pas b/ide/mainintf.pas index be03dac8da..837152826f 100644 --- a/ide/mainintf.pas +++ b/ide/mainintf.pas @@ -117,6 +117,9 @@ type protected function GetToolStatus: TIDEToolStatus; virtual; abstract; function GetActiveProject: TLazProject; override; + + function CreateProjectObject(ProjectDesc, + FallbackProjectDesc: TProjectDescriptor): TProject; virtual; abstract; public HiddenWindowsOnRun: TList; // list of forms, that were automatically hidden // and will be shown when debugged program stops @@ -150,8 +153,6 @@ type function DoShowProjectInspector: TModalResult; virtual; abstract; function DoImExportCompilerOptions(Sender: TObject): TModalResult; virtual; abstract; - function CreateProjectObject(ProjectDesc, - FallbackProjectDesc: TProjectDescriptor): TProject; virtual; abstract; function PrepareForCompile: TModalResult; virtual; abstract; function DoSaveBuildIDEConfigs(Flags: TBuildLazarusFlags): TModalResult; virtual; abstract; function DoBuildLazarus(Flags: TBuildLazarusFlags): TModalResult; virtual; abstract; diff --git a/ide/unitdependencies.pas b/ide/unitdependencies.pas index d5cbfd84b2..1979c3bc19 100644 --- a/ide/unitdependencies.pas +++ b/ide/unitdependencies.pas @@ -201,8 +201,6 @@ type procedure SetRootFilename(const AValue: string); procedure SetRootShortFilename(const AValue: string); procedure CommitUnitHistoryListSelection; - protected - procedure KeyUp(var Key: Word; Shift: TShiftState); override; public constructor Create(TheOwner: TComponent); override; destructor Destroy; override; @@ -211,6 +209,7 @@ type procedure Refresh; procedure RefreshHistoryList; function RootValid: boolean; + procedure KeyUp(var Key: Word; Shift: TShiftState); override; property OnAccessingSources: TNotifyEvent read FOnAccessingSources write FOnAccessingSources; property OnGetProjectMainFilename: TOnGetProjectMainFilename diff --git a/lcl/controls.pp b/lcl/controls.pp index ddcbc6b8aa..fd0c66b821 100644 --- a/lcl/controls.pp +++ b/lcl/controls.pp @@ -241,9 +241,9 @@ type FDeviceContext: HDC; FWindowHandle: HWND; procedure SetControl(AControl: TControl); - procedure CreateFont; override; protected procedure CreateHandle; override; + procedure CreateFont; override; public constructor Create; destructor Destroy; override; @@ -699,13 +699,6 @@ type protected FClient: TControl; procedure AssignClient(AClient: TObject); override; - function IsCaptionLinked: Boolean; override; - function IsEnabledLinked: Boolean; override; - function IsHelpLinked: Boolean; override; - function IsHintLinked: Boolean; override; - function IsVisibleLinked: Boolean; override; - function IsOnExecuteLinked: Boolean; override; - function DoShowHint(var HintStr: string): Boolean; virtual; procedure SetCaption(const Value: string); override; procedure SetEnabled(Value: Boolean); override; procedure SetHint(const Value: String); override; @@ -714,6 +707,14 @@ type procedure SetHelpType(Value: THelpType); override; procedure SetVisible(Value: Boolean); override; procedure SetOnExecute(Value: TNotifyEvent); override; + function IsOnExecuteLinked: Boolean; override; + function DoShowHint(var HintStr: string): Boolean; virtual; + public + function IsCaptionLinked: Boolean; override; + function IsEnabledLinked: Boolean; override; + function IsHelpLinked: Boolean; override; + function IsHintLinked: Boolean; override; + function IsVisibleLinked: Boolean; override; end; TControlActionLinkClass = class of TControlActionLink; @@ -1560,8 +1561,6 @@ type procedure Remove(AControl: TControl); procedure AlignNonAlignedControls(ListOfControls: TFPList; var BoundsModified: Boolean); - function IsClientHeightStored: boolean; override; - function IsClientWidthStored: boolean; override; protected FWinControlFlags: TWinControlFlags; procedure AdjustClientRect(var ARect: TRect); virtual; @@ -1575,6 +1574,8 @@ type procedure ResizeDelayedAutoSizeChildren; virtual; procedure InvalidatePreferredChildSizes; function CanTab: Boolean; override; + function IsClientHeightStored: boolean; override; + function IsClientWidthStored: boolean; override; procedure CMShowingChanged(var Message: TLMessage); message CM_SHOWINGCHANGED; procedure CMVisibleChanged(var TheMessage: TLMessage); message CM_VISIBLECHANGED; procedure DoSendShowHideToInterface; virtual; @@ -1699,7 +1700,6 @@ type procedure SetColor(Value: TColor); override; procedure SetChildZPosition(const AChild: TControl; const APosition: Integer); procedure ShowControl(AControl: TControl); virtual; - procedure Update; override; procedure UpdateControlState; procedure UpdateShowing; virtual; procedure WndProc(var Message: TLMessage); override; @@ -1789,6 +1789,7 @@ type procedure InsertControl(AControl: TControl; Index: integer); virtual; procedure RemoveControl(AControl: TControl); procedure Repaint; override; + procedure Update; override; procedure SetFocus; virtual; function FindChildControl(const ControlName: String): TControl; procedure FlipChildren(AllLevels: Boolean); dynamic; diff --git a/lcl/forms.pp b/lcl/forms.pp index fdddd1e2d6..d3cf6e5eed 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -161,7 +161,6 @@ type function GetClientScrollOffset: TPoint; override; function GetLogicalClientRect: TRect; override;// logical size of client area procedure DoOnResize; override; - class function GetControlClassDefaultSize: TPoint; override; procedure WMHScroll(var Message : TLMHScroll); message LM_HScroll; procedure WMVScroll(var Message : TLMVScroll); message LM_VScroll; procedure ScrollBy(DeltaX, DeltaY: Integer); @@ -174,6 +173,7 @@ type destructor Destroy; override; procedure UpdateScrollbars; function HasVisibleScrollbars: boolean; virtual; + class function GetControlClassDefaultSize: TPoint; override; published property HorzScrollBar: TControlScrollBar read FHorzScrollBar write SetHorzScrollBar stored StoreScrollBars; @@ -258,10 +258,10 @@ type procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure SetParent(AParent: TWinControl); override; - class function GetControlClassDefaultSize: TPoint; override; procedure DefineProperties(Filer: TFiler); override; public constructor Create(AOwner: TComponent); override; + class function GetControlClassDefaultSize: TPoint; override; end; TCustomFrameClass = class of TCustomFrame; @@ -462,7 +462,6 @@ type procedure CreateParams(var Params: TCreateParams); override; procedure CreateWnd; override; procedure Deactivate; dynamic; - procedure DestroyWnd; override; procedure DoClose(var CloseAction: TCloseAction); dynamic; procedure DoCreate; virtual; procedure DoDestroy; virtual; @@ -483,13 +482,10 @@ type procedure UpdateWindowState; procedure VisibleChanging; override; procedure WndProc(var TheMessage : TLMessage); override; - function FormIsUpdating: boolean; override; function VisibleIsStored: boolean; - function ColorIsStored: boolean; override; procedure DoSendBoundsToInterface; override; procedure DoAutoSize; override; procedure SetAutoSize(const Value: Boolean); override; - class function GetControlClassDefaultSize: TPoint; override; protected // drag and dock procedure DoDock(NewDockSite: TWinControl; var ARect: TRect); override; @@ -508,6 +504,7 @@ type procedure BeforeDestruction; override; function BigIconHandle: HICON; function SmallIconHandle: HICON; + procedure DestroyWnd; override; destructor Destroy; override; procedure Close; function CloseQuery: boolean; virtual; @@ -516,6 +513,8 @@ type procedure Show; procedure ShowOnTop; procedure EnsureVisible(AMoveToTop: boolean = true); + function FormIsUpdating: boolean; override; + class function GetControlClassDefaultSize: TPoint; override; function NeedParentForAutoSize: Boolean; override; function WantChildKey(Child : TControl; var Message : TLMessage): Boolean; virtual; @@ -535,6 +534,7 @@ type procedure AddHandlerCreate(OnCreateHandler: TNotifyEvent; AsLast: Boolean=true); procedure RemoveHandlerCreate(OnCreateHandler: TNotifyEvent); function IsShortcut(var Message: TLMKey): boolean; virtual; + function ColorIsStored: boolean; override; procedure IntfDropFiles(const FileNames: Array of String); procedure IntfHelp(AComponent: TComponent); function GetFormImage: TBitmap; @@ -720,9 +720,6 @@ type procedure SetAutoHide(Value : Boolean); procedure AutoHideHint(Sender : TObject); procedure SetHideInterval(Value : Integer); - protected - procedure Paint; override; - class function GetControlClassDefaultSize: TPoint; override; public constructor Create(AOwner: TComponent); override; destructor Destroy; override; @@ -732,6 +729,8 @@ type function CalcHintRect(MaxWidth: Integer; const AHint: String; AData: Pointer): TRect; virtual; procedure ReleaseHandle; + procedure Paint; override; + class function GetControlClassDefaultSize: TPoint; override; public property AutoHide : Boolean read FAutoHide write SetAutoHide; property HideInterval : Integer read FHideInterval write SetHideInterval; diff --git a/lcl/lresources.pp b/lcl/lresources.pp index 8cba4ef6cc..3de6950c9d 100644 --- a/lcl/lresources.pp +++ b/lcl/lresources.pp @@ -122,7 +122,6 @@ type procedure SkipSetBody; protected function ReadIntegerContent: integer; - procedure Read(var Buf; Count: LongInt); {$IFNDEF VER2_0}override;{$ENDIF} public constructor Create(AStream: TStream; BufSize: Integer); virtual; destructor Destroy; override; @@ -134,6 +133,7 @@ type var CompClassName, CompName: String); override; function BeginProperty: String; override; + procedure Read(var Buf; Count: LongInt); {$IFNDEF VER2_0}override;{$ENDIF} procedure ReadBinary(const DestData: TMemoryStream); override; function ReadFloat: Extended; override; function ReadSingle: Single; override; @@ -171,7 +171,6 @@ type FSignatureWritten: Boolean; protected procedure FlushBuffer; - procedure Write(const Buffer; Count: Longint); {$IFNDEF VER2_0}override;{$ENDIF} procedure WriteValue(Value: TValueType); procedure WriteStr(const Value: String); procedure WriteIntegerContent(i: integer); @@ -201,6 +200,7 @@ type procedure EndProperty; override; function GetStackPath(Root: TComponent): string; + procedure Write(const Buffer; Count: Longint); {$IFNDEF VER2_0}override;{$ENDIF} procedure WriteBinary(const Buffer; Count: LongInt); override; procedure WriteBoolean(Value: Boolean); override; procedure WriteFloat(const Value: Extended); override; diff --git a/lcl/menus.pp b/lcl/menus.pp index 56be9fdaba..d74789fdb6 100644 --- a/lcl/menus.pp +++ b/lcl/menus.pp @@ -65,15 +65,7 @@ type FClient: TMenuItem; procedure AssignClient(AClient: TObject); override; function IsAutoCheckLinked: Boolean; virtual; - function IsCaptionLinked: Boolean; override; - function IsCheckedLinked: Boolean; override; - function IsEnabledLinked: Boolean; override; - function IsHelpContextLinked: Boolean; override; - function IsHintLinked: Boolean; override; - function IsGroupIndexLinked: Boolean; override; - function IsImageIndexLinked: Boolean; override; - function IsShortCutLinked: Boolean; override; - function IsVisibleLinked: Boolean; override; + protected function IsOnExecuteLinked: Boolean; override; procedure SetAutoCheck(Value: Boolean); override; procedure SetCaption(const Value: string); override; @@ -85,6 +77,16 @@ type procedure SetShortCut(Value: TShortCut); override; procedure SetVisible(Value: Boolean); override; procedure SetOnExecute(Value: TNotifyEvent); override; + public + function IsCaptionLinked: Boolean; override; + function IsCheckedLinked: Boolean; override; + function IsEnabledLinked: Boolean; override; + function IsHelpContextLinked: Boolean; override; + function IsHintLinked: Boolean; override; + function IsGroupIndexLinked: Boolean; override; + function IsImageIndexLinked: Boolean; override; + function IsShortCutLinked: Boolean; override; + function IsVisibleLinked: Boolean; override; end; TMenuActionLinkClass = class of TMenuActionLink;