Dylan Smith : richedit: Removed redundant wrapping code.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e4007e9f97eb5742b282b93d5eef88ee68dddea0
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e4007e9f97eb5742b282b93d5e...

Author: Dylan Smith 
Date:   Thu Jul 10 10:17:23 2008 -0400

richedit: Removed redundant wrapping code.

Lines in ME_WrapHandleRun were removed because ME_CalcRunExtent is
already called unconditionally just before it in the call to
ME_WrapSizeRun.

---

dlls/riched20/wrap.c |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index adabea1..82c2698 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -320,12 +320,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
     ME_InsertRowStart(wc, p);
     return p;
   }
-  /* we're not at the end of the row */
-  if (run->nFlags & MERF_TAB) {
-    /* force recomputation of tabs' size as it depends on position */
-    ME_CalcRunExtent(wc->context, &ME_GetParagraph(p)->member.para,
-                     wc->nRow ? wc->nLeftMargin : wc->nFirstMargin, run);
-  }

/* will current run fit? */
   if (wc->pt.x + run->nWidth > wc->nAvailWidth)
@@ -423,12 +417,6 @@ static void ME_WrapTextParagraph(ME_Context *c, ME_DisplayItem *tp, DWORD begino
       wc.pt.y += border;
   }

-  if (c->editor->bWordWrap)
-    wc.nAvailWidth = c->rcView.right - c->rcView.left - wc.nFirstMargin - wc.nRightMargin;
-  else
-    wc.nAvailWidth = ~0u >> 1;
-  wc.pRowStart = NULL;
-
   linespace = ME_GetParaLineSpace(c, &tp->member.para);

ME_BeginRow(&wc);