diff --git a/.gitattributes b/.gitattributes index 9366d46e37..8a1291cd6b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7133,6 +7133,7 @@ lcl/include/customcombobox.inc svneol=native#text/pascal lcl/include/customcontrol.inc svneol=native#text/pascal lcl/include/customdbcombobox.inc svneol=native#text/pascal lcl/include/customdblistbox.inc svneol=native#text/pascal +lcl/include/customdesigncontrol.inc svneol=native#text/pascal lcl/include/customdockform.inc svneol=native#text/pascal lcl/include/customedit.inc svneol=native#text/pascal lcl/include/customflowpanel.inc svneol=native#text/pascal diff --git a/lcl/forms.pp b/lcl/forms.pp index 6795e8d27b..f89253a479 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -251,18 +251,30 @@ type property OnPaint; end; + TCustomDesignControl = class(TScrollingWinControl) + protected + FDesignTimePPI: Integer; + FPixelsPerInch: Integer; + + procedure SetDesignTimePPI(const ADesignTimePPI: Integer); + protected + procedure Loaded; override; + public + constructor Create(TheOwner: TComponent); override; + public + property DesignTimePPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96; + property PixelsPerInch: Integer read FPixelsPerInch write FPixelsPerInch stored False; + end; + { TCustomFrame } - TCustomFrame = class(TScrollingWinControl) + TCustomFrame = class(TCustomDesignControl) private - FDesignTimePPI: Integer; - FPixelsPerInch: Integer; procedure AddActionList(ActionList: TCustomActionList); procedure RemoveActionList(ActionList: TCustomActionList); procedure ReadDesignLeft(Reader: TReader); procedure ReadDesignTop(Reader: TReader); - procedure SetDesignTimePPI(const aDesignTimePPI: Integer); procedure WriteDesignLeft(Writer: TWriter); procedure WriteDesignTop(Writer: TWriter); protected @@ -273,7 +285,6 @@ type procedure DefineProperties(Filer: TFiler); override; procedure CalculatePreferredSize(var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); override; - procedure Loaded; override; procedure AutoAdjustLayout(AMode: TLayoutAdjustmentPolicy; const AFromDPI, AToDPI, AOldFormWidth, ANewFormWidth: Integer; const AScaleFonts: Boolean); override; @@ -281,9 +292,6 @@ type constructor Create(AOwner: TComponent); override; procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override; class function GetControlClassDefaultSize: TSize; override; - public - property DesignTimePPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96; - property PixelsPerInch: Integer read FPixelsPerInch write FPixelsPerInch; end; TCustomFrameClass = class of TCustomFrame; @@ -413,7 +421,7 @@ type TModalDialogFinished = procedure (Sender: TObject; AResult: Integer) of object; - TCustomForm = class(TScrollingWinControl) + TCustomForm = class(TCustomDesignControl) private FActive: Boolean; FActiveControl: TWinControl; @@ -453,7 +461,6 @@ type FOnShortcut: TShortCutEvent; FOnShow: TNotifyEvent; FOnWindowStateChange: TNotifyEvent; - FPixelsPerInch: Longint; FPosition: TPosition; FRealizedShowInTaskBar: TShowInTaskbar; FRestoredLeft: integer; @@ -462,7 +469,6 @@ type FRestoredHeight: integer; FShowInTaskbar: TShowInTaskbar; FWindowState: TWindowState; - FDesignTimePPI: Integer; FScaled: Boolean; function GetClientHandle: HWND; function GetEffectiveShowInTaskBar: TShowInTaskBar; @@ -481,7 +487,6 @@ type procedure SetAlphaBlend(const AValue: Boolean); procedure SetAlphaBlendValue(const AValue: Byte); procedure SetBorderIcons(NewIcons: TBorderIcons); - procedure SetDesignTimePPI(const aDesignTimePPI: Integer); procedure SetFormBorderStyle(NewStyle: TFormBorderStyle); procedure SetCancelControl(NewControl: TControl); procedure SetDefaultControl(NewControl: TControl); @@ -671,8 +676,7 @@ type property DefaultMonitor: TDefaultMonitor read FDefaultMonitor write FDefaultMonitor default dmActiveForm; property Designer: TIDesigner read FDesigner write FDesigner; - property DesignTimeDPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96; deprecated 'Use DesignTimePPI instead. DesignTimeDPI will be removed in 1.8'; - property DesignTimePPI: Integer read FDesignTimePPI write SetDesignTimePPI default 96; + property DesignTimeDPI: Integer read FDesignTimePPI write SetDesignTimePPI stored False; deprecated 'Use DesignTimePPI instead. DesignTimeDPI will be removed in 1.8'; property EffectiveShowInTaskBar: TShowInTaskBar read GetEffectiveShowInTaskBar; property FormState: TFormState read FFormState; property FormStyle: TFormStyle read FFormStyle write SetFormStyle @@ -704,7 +708,6 @@ type property OnWindowStateChange: TNotifyEvent read FOnWindowStateChange write FOnWindowStateChange; property ParentFont default False; - property PixelsPerInch: Longint read FPixelsPerInch write FPixelsPerInch stored False; property Position: TPosition read FPosition write SetPosition default poDesigned; property RestoredLeft: integer read FRestoredLeft; property RestoredTop: integer read FRestoredTop; @@ -1778,6 +1781,7 @@ function GetFirstParentForm(Control:TControl): TCustomForm; function ValidParentForm(Control: TControl; TopForm: Boolean = True): TCustomForm; function GetDesignerForm(APersistent: TPersistent): TCustomForm; function FindRootDesigner(APersistent: TPersistent): TIDesigner; +function NeedParentDesignControl(Control: TControl): TCustomDesignControl; function IsAccel(VK: word; const Str: string): Boolean; procedure NotifyApplicationUserInput(Target: TControl; Msg: Cardinal); @@ -1981,6 +1985,21 @@ begin Result := nil; end; +//------------------------------------------------------------------------------ +function NeedParentDesignControl(Control: TControl): TCustomDesignControl; +var + SControl: TControl; +begin + SControl := Control; + while (Control <> nil) and (Control.Parent <> nil) do + Control := Control.Parent; + + if Control is TCustomDesignControl then + Result := TCustomDesignControl(Control) + else + raise EInvalidOperation.CreateFmt(rsControlHasNoParentFormOrFrame, [SControl.Name]); +end; + //------------------------------------------------------------------------------ function GetDesignerForm(Control: TControl): TCustomForm; begin @@ -2154,6 +2173,7 @@ end; {$I controlscrollbar.inc} {$I scrollingwincontrol.inc} {$I scrollbox.inc} +{$I customdesigncontrol.inc} {$I customframe.inc} {$I customform.inc} {$I customdockform.inc} diff --git a/lcl/include/control.inc b/lcl/include/control.inc index 09d3d34c7b..a39023258f 100644 --- a/lcl/include/control.inc +++ b/lcl/include/control.inc @@ -766,58 +766,34 @@ end; function TControl.ScaleCoord(const ASize: Integer): Integer; var - ParentForm: TCustomForm; + ParentForm: TCustomDesignControl; begin - ParentForm := GetParentForm(Self); - if ParentForm=nil then - raise EInvalidOperation.CreateFmt(rsControlHasNoParentForm, [Name]); - - if ParentForm.DesignTimePPI=ParentForm.PixelsPerInch then - Result := ASize - else - Result := MulDiv(ASize, ParentForm.PixelsPerInch, ParentForm.DesignTimePPI); + ParentForm := NeedParentDesignControl(Self); + Result := MulDiv(ASize, ParentForm.PixelsPerInch, ParentForm.DesignTimePPI); end; function TControl.ScaleCoord96(const ASize: Integer): Integer; var - ParentForm: TCustomForm; + ParentForm: TCustomDesignControl; begin - ParentForm := GetParentForm(Self); - if ParentForm=nil then - raise EInvalidOperation.CreateFmt(rsControlHasNoParentForm, [Name]); - - if ParentForm.PixelsPerInch=96 then - Result := ASize - else - Result := MulDiv(ASize, ParentForm.PixelsPerInch, 96); + ParentForm := NeedParentDesignControl(Self); + Result := MulDiv(ASize, ParentForm.PixelsPerInch, 96); end; function TControl.ScaleCoord96Back(const ASize: Integer): Integer; var - ParentForm: TCustomForm; + ParentForm: TCustomDesignControl; begin - ParentForm := GetParentForm(Self); - if ParentForm=nil then - raise EInvalidOperation.CreateFmt(rsControlHasNoParentForm, [Name]); - - if ParentForm.PixelsPerInch=96 then - Result := ASize - else - Result := MulDiv(ASize, 96, ParentForm.PixelsPerInch); + ParentForm := NeedParentDesignControl(Self); + Result := MulDiv(ASize, 96, ParentForm.PixelsPerInch); end; function TControl.ScaleCoordBack(const ASize: Integer): Integer; var - ParentForm: TCustomForm; + ParentForm: TCustomDesignControl; begin - ParentForm := GetParentForm(Self); - if ParentForm=nil then - raise EInvalidOperation.CreateFmt(rsControlHasNoParentForm, [Name]); - - if ParentForm.DesignTimePPI=ParentForm.PixelsPerInch then - Result := ASize - else - Result := MulDiv(ASize, ParentForm.DesignTimePPI, ParentForm.PixelsPerInch); + ParentForm := NeedParentDesignControl(Self); + Result := MulDiv(ASize, ParentForm.DesignTimePPI, ParentForm.PixelsPerInch); end; {------------------------------------------------------------------------------ diff --git a/lcl/include/customdesigncontrol.inc b/lcl/include/customdesigncontrol.inc new file mode 100644 index 0000000000..afcf160d4e --- /dev/null +++ b/lcl/include/customdesigncontrol.inc @@ -0,0 +1,38 @@ +{%MainUnit ../forms.pp} + +{ + ***************************************************************************** + This file is part of the Lazarus Component Library (LCL) + + See the file COPYING.modifiedLGPL.txt, included in this distribution, + for details about the license. + ***************************************************************************** +} + +{ TCustomDesignControl } + +constructor TCustomDesignControl.Create(TheOwner: TComponent); +begin + inherited Create(TheOwner); + + FDesignTimePPI := 96; + FPixelsPerInch := FDesignTimePPI; +end; + +procedure TCustomDesignControl.Loaded; +begin + inherited Loaded; + + if csDesigning in ComponentState then + FDesignTimePPI := Screen.PixelsPerInch; + FPixelsPerInch := FDesignTimePPI; +end; + +procedure TCustomDesignControl.SetDesignTimePPI(const ADesignTimePPI: Integer); +begin + if (csLoading in ComponentState) // allow setting only when loading + or not (csDesigning in ComponentState) then // or in runtime (the programmer has to know why he is doing that) + FDesignTimePPI := ADesignTimePPI + else + raise EInvalidOperation.Create(sCannotSetDesignTimePPI); +end; diff --git a/lcl/include/customform.inc b/lcl/include/customform.inc index 84e138a084..f8a65f7c40 100644 --- a/lcl/include/customform.inc +++ b/lcl/include/customform.inc @@ -354,15 +354,6 @@ begin end; end; -procedure TCustomForm.SetDesignTimePPI(const aDesignTimePPI: Integer); -begin - if (csLoading in ComponentState) // allow setting only when loading - or not (csDesigning in ComponentState) then // or in runtime (the programmer has to know why he is doing that) - FDesignTimePPI := aDesignTimePPI - else - raise EInvalidOperation.Create(sCannotSetDesignTimePPI); -end; - {------------------------------------------------------------------------------ Method: TCustomForm.SetIcon Params: the new icon @@ -2062,8 +2053,6 @@ begin FShowInTaskbar := stDefault; FAlphaBlend := False; FAlphaBlendValue := 255; - FDesignTimePPI := 96; - FPixelsPerInch := FDesignTimePPI; // set border style before handle is allocated if not (fsBorderStyleChanged in FFormState) then FFormBorderStyle:= bsSizeable; @@ -2680,9 +2669,6 @@ begin if Control.CanFocus then SetActiveControl(Control); end; //DebugLn('TCustomForm.Loaded ',Name,':',ClassName,' ',FormUpdating,' ',fsCreating in FFormState,' ',Visible,' ',fsVisible in FormState); - if csDesigning in ComponentState then - FDesignTimePPI := Screen.PixelsPerInch; - FPixelsPerInch := FDesignTimePPI; if fsVisible in FormState then Visible := True; end; diff --git a/lcl/include/customframe.inc b/lcl/include/customframe.inc index ca9de70bcc..221bf933fb 100644 --- a/lcl/include/customframe.inc +++ b/lcl/include/customframe.inc @@ -39,15 +39,6 @@ begin ParentForm.DoRemoveActionList(ActionList); end; -procedure TCustomFrame.SetDesignTimePPI(const aDesignTimePPI: Integer); -begin - if (csLoading in ComponentState) // allow setting only when loading - or not (csDesigning in ComponentState) then // or in runtime (the programmer has to know why he is doing that) - FDesignTimePPI := aDesignTimePPI - else - raise EInvalidOperation.Create(sCannotSetDesignTimePPI); -end; - procedure TCustomFrame.ReadDesignLeft(Reader: TReader); var Temp: LongInt; @@ -162,15 +153,6 @@ begin Result.CY := 240; end; -procedure TCustomFrame.Loaded; -begin - inherited Loaded; - - if csDesigning in ComponentState then - FDesignTimePPI := Screen.PixelsPerInch; - FPixelsPerInch := FDesignTimePPI; -end; - procedure TCustomFrame.DefineProperties(Filer: TFiler); Var Ancestor: TComponent; @@ -202,8 +184,6 @@ begin inherited Create(AOwner); ControlStyle := [csAcceptsControls, csCaptureMouse, csClickEvents, csSetCaption, csDoubleClicks, csParentBackground]; - FDesignTimePPI := 96; - FPixelsPerInch := FDesignTimePPI; if (ClassType<>TFrame) and ([csDesignInstance, csDesigning]*ComponentState=[]) then begin if not InitInheritedComponent(Self, TFrame) then diff --git a/lcl/languages/lclstrconsts.ca.po b/lcl/languages/lclstrconsts.ca.po index 4b766ddef6..44825c2f88 100644 --- a/lcl/languages/lclstrconsts.ca.po +++ b/lcl/languages/lclstrconsts.ca.po @@ -370,8 +370,8 @@ msgstr "Sensible a majúsc-minúsc." msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.cs.po b/lcl/languages/lclstrconsts.cs.po index f74de08993..ed8fdb16b2 100644 --- a/lcl/languages/lclstrconsts.cs.po +++ b/lcl/languages/lclstrconsts.cs.po @@ -364,8 +364,8 @@ msgstr "Rozlišovat velká/malá" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Prvek třídy '%s' nemůže mít prvek třídy '%s' jako dítě" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.de.po b/lcl/languages/lclstrconsts.de.po index 3d9b1fdc33..25ec3063ef 100644 --- a/lcl/languages/lclstrconsts.de.po +++ b/lcl/languages/lclstrconsts.de.po @@ -363,8 +363,8 @@ msgstr "Schreibweisenabhängig" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.es.po b/lcl/languages/lclstrconsts.es.po index 1d4430e6d1..c2d9d092de 100644 --- a/lcl/languages/lclstrconsts.es.po +++ b/lcl/languages/lclstrconsts.es.po @@ -360,8 +360,8 @@ msgstr "Sensible a mayúsculas/minúsculas" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "El control de clase '%s' no puede tener al control de clase '%s' como hijo" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.fi.po b/lcl/languages/lclstrconsts.fi.po index 7fdb85e734..7f9205b4d5 100644 --- a/lcl/languages/lclstrconsts.fi.po +++ b/lcl/languages/lclstrconsts.fi.po @@ -360,8 +360,8 @@ msgstr "Sama kirjainkoko" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Luokan '%s' kontrollin lapsi ei voi olla luokan '%s' kontrolli" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.fr.po b/lcl/languages/lclstrconsts.fr.po index 6aa4542181..4efccd13df 100644 --- a/lcl/languages/lclstrconsts.fr.po +++ b/lcl/languages/lclstrconsts.fr.po @@ -362,8 +362,8 @@ msgstr "Respecter la casse" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Le contrôle de la classe \"%s\" ne peut pas contenir un contrôle de la classe \"%s\" comme enfant" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.he.po b/lcl/languages/lclstrconsts.he.po index 4f3e641471..fedaabb03b 100644 --- a/lcl/languages/lclstrconsts.he.po +++ b/lcl/languages/lclstrconsts.he.po @@ -371,8 +371,8 @@ msgstr "רגיש לריישיות" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "פקד של המחלקה '%s' לא יכול לקבל פקד של מחלקה s% בתור בן" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.hu.po b/lcl/languages/lclstrconsts.hu.po index cd90907a8c..9c726423e3 100644 --- a/lcl/languages/lclstrconsts.hu.po +++ b/lcl/languages/lclstrconsts.hu.po @@ -362,8 +362,8 @@ msgstr "Kis-/nagybetűre érzékeny" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "'%s' osztályú vezérlőnek nem lehet gyermeke egy '%s' osztályú vezérlő" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.id.po b/lcl/languages/lclstrconsts.id.po index 5252cb3fe5..5c09ecebcc 100644 --- a/lcl/languages/lclstrconsts.id.po +++ b/lcl/languages/lclstrconsts.id.po @@ -371,8 +371,8 @@ msgstr "Sensitif huruf" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.it.po b/lcl/languages/lclstrconsts.it.po index 79cad314da..09805f2b48 100644 --- a/lcl/languages/lclstrconsts.it.po +++ b/lcl/languages/lclstrconsts.it.po @@ -364,8 +364,8 @@ msgstr "Differenzia maiuscolo e minuscolo" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Un controllo di classe '%s' non può avere figli di classe '%s'" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.ja.po b/lcl/languages/lclstrconsts.ja.po index 0da1684800..d0ac54f6fc 100644 --- a/lcl/languages/lclstrconsts.ja.po +++ b/lcl/languages/lclstrconsts.ja.po @@ -370,8 +370,8 @@ msgstr "大文字小文字を区別" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "コントロールクラス '%s' はコントロールクラス '%s' を子とすることはできません" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.lt.po b/lcl/languages/lclstrconsts.lt.po index 369f9f4825..5cac0add21 100644 --- a/lcl/languages/lclstrconsts.lt.po +++ b/lcl/languages/lclstrconsts.lt.po @@ -371,8 +371,8 @@ msgstr "Skirti raidžių lygį" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "„%s“ klasės valdiklis negali būti „%s“ klasės valdiklio tėvas" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.nl.po b/lcl/languages/lclstrconsts.nl.po index d58d0dd066..2a12c25f00 100644 --- a/lcl/languages/lclstrconsts.nl.po +++ b/lcl/languages/lclstrconsts.nl.po @@ -371,8 +371,8 @@ msgstr "Hoofdletter gevoelig" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Control van klasse '%s' kan control van klasse '%s' niet als kind hebben" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.no.po b/lcl/languages/lclstrconsts.no.po index bb49d1874a..9871a32301 100644 --- a/lcl/languages/lclstrconsts.no.po +++ b/lcl/languages/lclstrconsts.no.po @@ -370,8 +370,8 @@ msgstr "Skill mellom store/små bokstaver" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.pl.po b/lcl/languages/lclstrconsts.pl.po index 9ec80175a6..75cdc9ada9 100644 --- a/lcl/languages/lclstrconsts.pl.po +++ b/lcl/languages/lclstrconsts.pl.po @@ -366,8 +366,8 @@ msgstr "Uwzględnij wielkość liter" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.po b/lcl/languages/lclstrconsts.po index 1f1f96c256..6d225e3430 100644 --- a/lcl/languages/lclstrconsts.po +++ b/lcl/languages/lclstrconsts.po @@ -355,8 +355,8 @@ msgstr "" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.pt.po b/lcl/languages/lclstrconsts.pt.po index cfcc8ac062..9ce55b222f 100644 --- a/lcl/languages/lclstrconsts.pt.po +++ b/lcl/languages/lclstrconsts.pt.po @@ -360,8 +360,8 @@ msgstr "Diferenciar maiúsc./minúsc." msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Controle de classe '%s' não pode ter controle de classe '%s' como filho" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.pt_BR.po b/lcl/languages/lclstrconsts.pt_BR.po index 66fa0c3d5f..b103ef29fe 100644 --- a/lcl/languages/lclstrconsts.pt_BR.po +++ b/lcl/languages/lclstrconsts.pt_BR.po @@ -368,8 +368,8 @@ msgstr "Diferenciar maiúsc./minúsc." msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Controle de classe '%s' não pode ter controle de classe '%s' como filho" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.ru.po b/lcl/languages/lclstrconsts.ru.po index 783930d2c0..368d0d1f75 100644 --- a/lcl/languages/lclstrconsts.ru.po +++ b/lcl/languages/lclstrconsts.ru.po @@ -362,9 +362,9 @@ msgstr "С учётом регистра" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Элемент управления класса '%s' не может иметь дочерний элемент управления класса '%s'" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" -msgstr "Элемент управления '%s' не имеет родительской формы" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" +msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow msgid "Control '%s' has no parent window" diff --git a/lcl/languages/lclstrconsts.sk.po b/lcl/languages/lclstrconsts.sk.po index ac2ffbb24a..073491009a 100644 --- a/lcl/languages/lclstrconsts.sk.po +++ b/lcl/languages/lclstrconsts.sk.po @@ -365,8 +365,8 @@ msgstr "Rozlišovať veľké a malé písmo" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Prvok triedy '%s' nemôže mať prvok triedy '%s' ako dieťa" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.tr.po b/lcl/languages/lclstrconsts.tr.po index 7a43e0b2cb..6e027a29cc 100644 --- a/lcl/languages/lclstrconsts.tr.po +++ b/lcl/languages/lclstrconsts.tr.po @@ -370,8 +370,8 @@ msgstr "Büyük/küçük harfe duyarlı" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.uk.po b/lcl/languages/lclstrconsts.uk.po index d70252439a..7f54c1cb31 100644 --- a/lcl/languages/lclstrconsts.uk.po +++ b/lcl/languages/lclstrconsts.uk.po @@ -371,8 +371,8 @@ msgstr "Врахування регістру" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "Елемент управління класу '%s' не може мати наслідником елемент класу '%s'" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/languages/lclstrconsts.zh_CN.po b/lcl/languages/lclstrconsts.zh_CN.po index 479ce0fc6e..a755efae9e 100644 --- a/lcl/languages/lclstrconsts.zh_CN.po +++ b/lcl/languages/lclstrconsts.zh_CN.po @@ -373,8 +373,8 @@ msgstr "大小写敏感" msgid "Control of class '%s' can't have control of class '%s' as a child" msgstr "" -#: lclstrconsts.rscontrolhasnoparentform -msgid "Control '%s' has no parent form" +#: lclstrconsts.rscontrolhasnoparentformorframe +msgid "Control '%s' has no parent form or frame" msgstr "" #: lclstrconsts.rscontrolhasnoparentwindow diff --git a/lcl/lclstrconsts.pas b/lcl/lclstrconsts.pas index 2fac2662c6..a077ee77a6 100644 --- a/lcl/lclstrconsts.pas +++ b/lcl/lclstrconsts.pas @@ -246,7 +246,7 @@ resourceString rsCreatingGdbCatchableError = 'Creating gdb catchable error:'; rsAControlCanNotHaveItselfAsParent = 'A control can''t have itself as a parent'; rsControlHasNoParentWindow = 'Control ''%s'' has no parent window'; - rsControlHasNoParentForm = 'Control ''%s'' has no parent form'; + rsControlHasNoParentFormOrFrame = 'Control ''%s'' has no parent form or frame'; rsControlIsNotAParent = '''%s'' is not a parent of ''%s'''; rsControlClassCantContainChildClass = 'Control of class ''%s'' can''t have control of class ''%s'' as a child'; rsASCannotHaveAsParent = 'Class %s cannot have %s as parent.';