Dylan Smith : richedit: Removed unused run flags values.

[Alexandre Julliard]

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

Author: Dylan Smith 
Date:   Wed Jul 28 21:18:03 2010 -0400

richedit: Removed unused run flags values.

The only place MERF_SKIPPED was in debug code, and MERF_CALCBYWRAP was only
used to clear this unused flag value, so I got rid of both of them.

---

dlls/riched20/editstr.h |    4 ----
 dlls/riched20/paint.c   |    5 +----
 dlls/riched20/wrap.c    |    3 ---
 3 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h
index c9c55da..5b5afae 100644
--- a/dlls/riched20/editstr.h
+++ b/dlls/riched20/editstr.h
@@ -118,10 +118,6 @@ typedef enum {
 #define MERF_ENDWHITE   0x004000
 /* run is completely made of whitespaces */
 #define MERF_WHITESPACE 0x008000
-/* run is a last (dummy) run in the paragraph */
-#define MERF_SKIPPED    0x010000
-/* flags that are calculated during text wrapping */
-#define MERF_CALCBYWRAP 0x0F0000
 /* the "end of paragraph" run, contains 1 character */
 #define MERF_ENDPARA    0x100000
 /* forcing the "end of row" run, contains 1 character */
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 5e52e51..2be034b 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -959,10 +959,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph)
           rc.top = c->pt.y + para->pt.y + run->pt.y;
           rc.bottom = rc.bottom + height;
           TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom);
-          if (run->nFlags & MERF_SKIPPED)
-            DrawFocusRect(c->hDC, &rc);
-          else
-            FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT));
+          FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT));
         }
         if (visible)
           ME_DrawRun(c, c->pt.x + run->pt.x,
diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index d2ebd94..a7c7fd3 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -349,7 +349,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
       return p->next;

if (run->nFlags & MERF_WHITESPACE) {
-      p->member.run.nFlags |= MERF_SKIPPED;
       wc->pt.x += run->nWidth;
       /* skip runs consisting of only whitespaces */
       return p->next;
@@ -362,7 +361,6 @@ static ME_DisplayItem *ME_WrapHandleRun(ME_WrapContext *wc, ME_DisplayItem *p)
       if (black) {
         wc->bOverflown = FALSE;
         pp = ME_SplitRun(wc, p, black);
-        p->member.run.nFlags |= MERF_SKIPPED;
         ME_InsertRowStart(wc, pp);
         return pp;
       }
@@ -588,7 +586,6 @@ static void ME_PrepareParagraphForWrapping(ME_Context *c, ME_DisplayItem *tp) {
           else
             break;
         }
-        p->member.run.nFlags &= ~MERF_CALCBYWRAP;
         break;
       default:
         break;