mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-21 13:08:18 +02:00
fixed searching parent for new control
git-svn-id: trunk@6837 -
This commit is contained in:
parent
820db9488b
commit
d9ea4139b2
@ -1782,6 +1782,7 @@ begin
|
|||||||
if (NewParent is TWinControl)
|
if (NewParent is TWinControl)
|
||||||
and (csAcceptsControls in TWinControl(NewParent).ControlStyle) then
|
and (csAcceptsControls in TWinControl(NewParent).ControlStyle) then
|
||||||
break;
|
break;
|
||||||
|
NewParent:=TControl(NewParent).Parent;
|
||||||
end;
|
end;
|
||||||
end else begin
|
end else begin
|
||||||
// New TypeClass is not a TControl => Root component as parent
|
// New TypeClass is not a TControl => Root component as parent
|
||||||
@ -1790,7 +1791,8 @@ begin
|
|||||||
NewParent:=TComponent(Root);
|
NewParent:=TComponent(Root);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
Result:=FindComponent(NewParent);
|
if NewParent<>nil then
|
||||||
|
Result:=FindComponent(NewParent);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
function TCustomFormEditor.GetDefaultComponentPosition(
|
function TCustomFormEditor.GetDefaultComponentPosition(
|
||||||
|
@ -37,9 +37,7 @@ TmpDir=$TmpBaseDir/fpc
|
|||||||
|
|
||||||
ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
|
ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
|
||||||
echo "extracting FPC from local cvs ..."
|
echo "extracting FPC from local cvs ..."
|
||||||
cd $TmpBaseDir
|
|
||||||
rm -rf $TmpDir
|
rm -rf $TmpDir
|
||||||
cd -
|
|
||||||
./cvsexportlocal $FPCSrcDir $TmpDir
|
./cvsexportlocal $FPCSrcDir $TmpDir
|
||||||
|
|
||||||
if [ $RenameSmart = "yes" ]; then
|
if [ $RenameSmart = "yes" ]; then
|
||||||
|
@ -4,10 +4,10 @@ set -x
|
|||||||
set -e
|
set -e
|
||||||
|
|
||||||
LazSrcDir=$1
|
LazSrcDir=$1
|
||||||
OutFile=lazarus-0.9.1-5.tgz
|
OutputFile=$2
|
||||||
|
|
||||||
if [ "x$LazSrcDir" = "x" ]; then
|
if [ "x$LazSrcDir" = "x" ]; then
|
||||||
echo "Usage: $0 <lazarus_source_directory>"
|
echo "Usage: $0 <lazarus_source_directory> <output-file>"
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
if [ ! -d $LazSrcDir/designer ]; then
|
if [ ! -d $LazSrcDir/designer ]; then
|
||||||
@ -15,18 +15,26 @@ if [ ! -d $LazSrcDir/designer ]; then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "remove /tmp/lazarus ..."
|
if [ "x$OutputFile" = "x" ]; then
|
||||||
cd /tmp
|
echo "Usage: $0 <lazarus_source_directory> <output-file>"
|
||||||
rm -rf /tmp/lazarus
|
exit -1
|
||||||
cd -
|
fi
|
||||||
sh create_clean_lazarus_directory.sh $LazSrcDir /tmp/lazarus
|
|
||||||
|
|
||||||
|
TmpBaseDir=/tmp
|
||||||
|
TmpDir=$TmpBaseDir/lazarus
|
||||||
|
|
||||||
|
ppc386 -Fu../../lcl/units/i386/linux cvsexportlocal.pas
|
||||||
|
echo "extracting Lazarus from local cvs ..."
|
||||||
|
rm -rf $TmpDir
|
||||||
|
./cvsexportlocal $LazSrcDir $TmpDir
|
||||||
|
|
||||||
# pack
|
# pack
|
||||||
echo "packing ..."
|
echo "packing ..."
|
||||||
cd /tmp/
|
cd /tmp
|
||||||
tar cvzf lazarus.tgz lazarus
|
tar cvzf lazarus.tgz lazarus
|
||||||
cd -
|
cd -
|
||||||
mv /tmp/lazarus.tgz $OutFile
|
mv /tmp/lazarus.tgz $OutputFile
|
||||||
rm -rf /tmp/lazarus
|
rm -rf /tmp/lazarus
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
Loading…
Reference in New Issue
Block a user