i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile errors; references to BFont* when should have been BFont&

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4404 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
ejakowatz
2003-08-29 22:33:17 +00:00
parent 0784fd8bde
commit 80a4aa919d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+9 -9
View File
@@ -1305,7 +1305,7 @@ BTextView::SetRunArray(int32 startOffset, int32 endOffset,
} }
fStyles->SetStyleRange(fromOffset, toOffset, textLength, fStyles->SetStyleRange(fromOffset, toOffset, textLength,
doAll, theRun->font, &theRun->color); doAll, &theRun->font, &theRun->color);
theRun++; theRun++;
} }
@@ -2009,11 +2009,11 @@ BTextView::FlattenRunArray(const text_run_array *inArray, int32 *outSize)
for (int32 i = 0; i < inArray->count; i++) for (int32 i = 0; i < inArray->count; i++)
{ {
array->styles[i].offset = inArray->runs[i].offset; array->styles[i].offset = inArray->runs[i].offset;
inArray->runs[i].font->GetFamilyAndStyle(&array->styles[i].family, inArray->runs[i].font.GetFamilyAndStyle(&array->styles[i].family,
&array->styles[i].style); &array->styles[i].style);
array->styles[i].size = inArray->runs[i].font->Size(); array->styles[i].size = inArray->runs[i].font.Size();
array->styles[i].shear = inArray->runs[i].font->Shear(); array->styles[i].shear = inArray->runs[i].font.Shear();
array->styles[i].face = inArray->runs[i].font->Face(); array->styles[i].face = inArray->runs[i].font.Face();
array->styles[i].red = inArray->runs[i].color.red; array->styles[i].red = inArray->runs[i].color.red;
array->styles[i].green = inArray->runs[i].color.green; array->styles[i].green = inArray->runs[i].color.green;
array->styles[i].blue = inArray->runs[i].color.blue; array->styles[i].blue = inArray->runs[i].color.blue;
@@ -2051,11 +2051,11 @@ BTextView::UnflattenRunArray(const void *data, int32 *outSize)
for (int32 i = 0; i < array->count; i++) { for (int32 i = 0; i < array->count; i++) {
run_array->runs[i].font = new BFont; run_array->runs[i].font = new BFont;
run_array->runs[i].font->SetFamilyAndStyle(array->styles[i].family, run_array->runs[i].font.SetFamilyAndStyle(array->styles[i].family,
array->styles[i].style); array->styles[i].style);
run_array->runs[i].font->SetSize(array->styles[i].size); run_array->runs[i].font.SetSize(array->styles[i].size);
run_array->runs[i].font->SetShear(array->styles[i].shear); run_array->runs[i].font.SetShear(array->styles[i].shear);
run_array->runs[i].font->SetFace(array->styles[i].face); run_array->runs[i].font.SetFace(array->styles[i].face);
run_array->runs[i].color.red = array->styles[i].red; run_array->runs[i].color.red = array->styles[i].red;
run_array->runs[i].color.green = array->styles[i].green; run_array->runs[i].color.green = array->styles[i].green;
run_array->runs[i].color.blue = array->styles[i].blue; run_array->runs[i].color.blue = array->styles[i].blue;