Merges changes from fpc trunk

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1803 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
sekelsenmat
2011-08-16 16:02:19 +00:00
parent 1e9af50ca1
commit 432fd2d3dd

View File

@ -64,7 +64,7 @@ type
{@@ {@@
Font orientation is measured in degrees and uses the Font orientation is measured in degrees and uses the
same direction as the LCL TFont.orientation, which is counter-clockwise. same direction as the LCL TFont.orientation, which is counter-clockwise.
Zero is the normal, horizontal, orientation. Zero is the normal, horizontal, orientation, directed to the right.
} }
Orientation: Double; Orientation: Double;
end; end;
@ -172,10 +172,7 @@ type
end; end;
{@@ {@@
TvText represents a text in memory. TvText represents a text entity.
At the moment fonts are unsupported, only simple texts
up to 255 chars are supported.
} }
TvText = class(TvEntity) TvText = class(TvEntity)
public public
@ -266,8 +263,8 @@ type
procedure ClearTmpPath(); procedure ClearTmpPath();
procedure AppendSegmentToTmpPath(ASegment: TPathSegment); procedure AppendSegmentToTmpPath(ASegment: TPathSegment);
public public
Name: string;
Width, Height: Double; // in millimeters Width, Height: Double; // in millimeters
Name: string;
{ Base methods } { Base methods }
constructor Create; constructor Create;
destructor Destroy; override; destructor Destroy; override;
@ -580,7 +577,7 @@ end;
Should be followed by zero or more calls to AddPointToPath Should be followed by zero or more calls to AddPointToPath
and by a call to EndPath to effectively add the data. and by a call to EndPath to effectively add the data.
@see StartPath, AddPointToPath @see EndPath, AddPointToPath
} }
procedure TvVectorialDocument.StartPath(AX, AY: Double); procedure TvVectorialDocument.StartPath(AX, AY: Double);
var var
@ -991,7 +988,7 @@ end;
{@@ {@@
Reads the document from a file. Reads the document from a file.
Any current contents will be removed. Any current contents in this object will be removed.
} }
procedure TvVectorialDocument.ReadFromFile(AFileName: string; procedure TvVectorialDocument.ReadFromFile(AFileName: string;
AFormat: TvVectorialFormat); AFormat: TvVectorialFormat);
@ -1009,7 +1006,7 @@ begin
end; end;
{@@ {@@
Reads the document from a file. A variant that auto-detects the format from the extension. Reads the document from a file. A variant that auto-detects the format from the extension and other factors.
} }
procedure TvVectorialDocument.ReadFromFile(AFileName: string); procedure TvVectorialDocument.ReadFromFile(AFileName: string);
var var
@ -1022,7 +1019,7 @@ end;
{@@ {@@
Reads the document from a stream. Reads the document from a stream.
Any current contents will be removed. Any current contents in this object will be removed.
} }
procedure TvVectorialDocument.ReadFromStream(AStream: TStream; procedure TvVectorialDocument.ReadFromStream(AStream: TStream;
AFormat: TvVectorialFormat); AFormat: TvVectorialFormat);