From 669d63d3232668d68d75699cb5388ea3dfc90719 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Sat, 22 Oct 2011 20:17:04 +0200 Subject: riched20: avoid a forward declaration --- dlls/riched20/wrap.c | 75 ++++++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 2ec67ab..e06db72 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -480,7 +480,42 @@ static int ME_GetParaLineSpace(ME_Context* c, ME_Paragraph* para) return sp * c->editor->nZoomNumerator / c->editor->nZoomDenominator; } -static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp); +static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { + ME_DisplayItem *p, *pRow; + + tp->member.para.nWidth = 0; + /* remove all items that will be reinserted by paragraph wrapper anyway */ + tp->member.para.nRows = 0; + for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { + switch(p->type) { + case diStartRow: + pRow = p; + p = p->prev; + ME_Remove(pRow); + ME_DestroyDisplayItem(pRow); + break; + default: + break; + } + } + /* join runs that can be joined, set up flags */ + for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { + switch(p->type) { + case diStartRow: assert(0); break; /* should have deleted it */ + case diRun: + while (p->next->type == diRun) { /* FIXME */ + if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { + ME_JoinRuns(c->editor, p); + } + else + break; + } + break; + default: + break; + } + } +} static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { ME_DisplayItem *p; @@ -558,44 +593,6 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp) { tp->member.para.nRows = wc.nRow; } - -static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) { - ME_DisplayItem *p, *pRow; - - tp->member.para.nWidth = 0; - /* remove all items that will be reinserted by paragraph wrapper anyway */ - tp->member.para.nRows = 0; - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: - pRow = p; - p = p->prev; - ME_Remove(pRow); - ME_DestroyDisplayItem(pRow); - break; - default: - break; - } - } - /* join runs that can be joined, set up flags */ - for (p = tp->next; p!=tp->member.para.next_para; p = p->next) { - switch(p->type) { - case diStartRow: assert(0); break; /* should have deleted it */ - case diRun: - while (p->next->type == diRun) { /* FIXME */ - if (ME_CanJoinRuns(&p->member.run, &p->next->member.run)) { - ME_JoinRuns(c->editor, p); - } - else - break; - } - break; - default: - break; - } - } -} - BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) { ME_DisplayItem *item; -- 1.7.1.GIT