diff --git a/components/rx/trunk/docs/rxcloseformvalidator.xml b/components/rx/trunk/docs/rxcloseformvalidator.xml
index 906fb44b5..6825536de 100644
--- a/components/rx/trunk/docs/rxcloseformvalidator.xml
+++ b/components/rx/trunk/docs/rxcloseformvalidator.xml
@@ -9,7 +9,8 @@
Событие для ручной проверки допустимости введённых данныхКолекция элементов проверки введённых данных
- Компонент визуальной настроки проверки введённых данных на диалоговых формахКомпонент визуальной настроки проверки введённых данных на диалоговых формах
+ Компонент визуальной настроки проверки введённых данных на диалоговых формахКомпонент визуальной настроки проверки введённых данных на диалоговых формах
+Функция производит проверку введённых данных
Функция производит проверку введённых данных
В случае ошбочных данных вернёт false.
Поиск элемента проверки по указателю на контрол
diff --git a/components/rx/trunk/images/TRxTextHolder.png b/components/rx/trunk/images/TRxTextHolder.png
new file mode 100644
index 000000000..e65ad6933
Binary files /dev/null and b/components/rx/trunk/images/TRxTextHolder.png differ
diff --git a/components/rx/trunk/images/TRxTextHolder_150.png b/components/rx/trunk/images/TRxTextHolder_150.png
new file mode 100644
index 000000000..eb83e1eab
Binary files /dev/null and b/components/rx/trunk/images/TRxTextHolder_150.png differ
diff --git a/components/rx/trunk/images/TRxTextHolder_200.png b/components/rx/trunk/images/TRxTextHolder_200.png
new file mode 100644
index 000000000..66df2da68
Binary files /dev/null and b/components/rx/trunk/images/TRxTextHolder_200.png differ
diff --git a/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder.svg b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder.svg
new file mode 100644
index 000000000..5be12447f
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder.svg
@@ -0,0 +1,368 @@
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_150.svg b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_150.svg
new file mode 100644
index 000000000..ef5bef3a5
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_150.svg
@@ -0,0 +1,377 @@
+
+
+
+
diff --git a/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_200.svg b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_200.svg
new file mode 100644
index 000000000..ccd1c9dcf
--- /dev/null
+++ b/components/rx/trunk/images/imgsrc/rxtools/trxtextholder/TRxTextHolder_200.svg
@@ -0,0 +1,355 @@
+
+
+
+
diff --git a/components/rx/trunk/images/mk_res.sh b/components/rx/trunk/images/mk_res.sh
index 41e4bb2af..d1bcf4ebf 100755
--- a/components/rx/trunk/images/mk_res.sh
+++ b/components/rx/trunk/images/mk_res.sh
@@ -62,7 +62,8 @@ rm RxSortZeos.res
TRxPopupNotifier.png TRxPopupNotifier_150.png TRxPopupNotifier_200.png \
TRxSystemServices.png TRxSystemServices_150.png TRxSystemServices_200.png \
TRxVersionInfo.png TRxVersionInfo_150.png TRxVersionInfo_200.png \
- TRxXMLPropStorage.png TRxXMLPropStorage_150.png TRxXMLPropStorage_200.png
+ TRxXMLPropStorage.png TRxXMLPropStorage_150.png TRxXMLPropStorage_200.png \
+ TRxTextHolder.png TRxTextHolder_150.png TRxTextHolder_200.png
/usr/local/share/lazarus/tools/lazres RxSortFBDataSet.res TRxSortFBDataSet.png TRxSortFBDataSet_150.png TRxSortFBDataSet_200.png
diff --git a/components/rx/trunk/images/rx.res b/components/rx/trunk/images/rx.res
index e5ba56bdc..62be7b456 100644
Binary files a/components/rx/trunk/images/rx.res and b/components/rx/trunk/images/rx.res differ
diff --git a/components/rx/trunk/rx.res b/components/rx/trunk/rx.res
index e5ba56bdc..62be7b456 100644
Binary files a/components/rx/trunk/rx.res and b/components/rx/trunk/rx.res differ
diff --git a/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas b/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
index 34f2a5ce2..388dca4d0 100644
--- a/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
+++ b/components/rx/trunk/rxcontrols/rxcloseformvalidator.pas
@@ -122,11 +122,6 @@ begin
Items[Index].Assign( AValue );
end;
-{constructor TValidateItems.Create;
-begin
- inherited Create(TValidateItem);
-end;}
-
{ TValidateItem }
procedure TValidateItem.SetControl(AValue: TWinControl);
diff --git a/components/rx/trunk/rxcontrols/rxmdi.pas b/components/rx/trunk/rxcontrols/rxmdi.pas
index 68a3a3eb4..a2e3053b6 100644
--- a/components/rx/trunk/rxcontrols/rxmdi.pas
+++ b/components/rx/trunk/rxcontrols/rxmdi.pas
@@ -472,8 +472,10 @@ begin
F.Parent:=Self;
F.Visible:=true;
F.BringToFront;
- if Assigned(Application) and Assigned(Application.MainForm) then
- Application.MainForm.ActiveControl:=F;
+// if Assigned(Application) and Assigned(Application.MainForm) and (Application.MainForm = Owner) then
+// Application.MainForm.ActiveControl:=F;
+ if Assigned(Owner) and (Owner is TForm) then
+ TForm(Owner).ActiveControl:=F;
B:=TRxMDIButton.CreateButton(TaskPanel, F);
DoOnChangeCurrentChild(F);