From 4f80ec917895ce83af1bce7764f9ec6a2dd91dc4 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Mon, 4 Nov 2002 20:29:47 +0000
Subject: [PATCH] - removed unnecessary include of WINGsP.h in some places -
 smaller space between rows of text in WMText

---
 WINGs/Tests/wtest.c |  3 ---
 WINGs/wtext.c       | 11 +++++++----
 src/appicon.c       |  1 -
 src/balloon.c       |  2 --
 src/defaults.c      |  2 --
 src/dock.c          |  2 --
 src/framewin.c      |  2 --
 src/menu.c          |  2 --
 src/text.c          |  3 +--
 src/workspace.c     |  2 --
 10 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/WINGs/Tests/wtest.c b/WINGs/Tests/wtest.c
index b0f4815b..f0936399 100644
--- a/WINGs/Tests/wtest.c
+++ b/WINGs/Tests/wtest.c
@@ -1293,9 +1293,6 @@ main(int argc, char **argv)
     testDragAndDrop(scr);
     testText(scr);
 
-    testFontPanel(scr);
-    testList(scr);
-
 #if 0
     testColorPanel(scr);
     testScrollView(scr);
diff --git a/WINGs/wtext.c b/WINGs/wtext.c
index 8f14268c..6ed43802 100644
--- a/WINGs/wtext.c
+++ b/WINGs/wtext.c
@@ -743,7 +743,7 @@ _getSibling:
             if (tPtr->flags.ownsSelection) {
                 XRectangle rect;
 
-                if ( sectionWasSelected(tPtr, tb, &rect, s)) {
+                if (sectionWasSelected(tPtr, tb, &rect, s)) {
                     tb->selected = True;
                     XFillRectangle(dpy, tPtr->db, WMColorGC(scr->gray),
                         rect.x, rect.y, rect.width, rect.height);
@@ -1472,7 +1472,8 @@ layOutLine(Text *tPtr, myLineItems *items, int nitems, int x, int y)
             
         } else { 
             font = (tPtr->flags.monoFont)?tPtr->dFont : tb->d.font;
-            max_d = WMAX(max_d, abs(font->height-font->y)); 
+            /*max_d = WMAX(max_d, abs(font->height-font->y));*/
+            max_d = 2;
             line_height = WMAX(line_height, font->height + max_d);
             text = &(tb->text[items[i].begin]);
             len = items[i].end - items[i].begin;
@@ -2346,7 +2347,8 @@ handleTextKeyPress(Text *tPtr, XEvent *event)
                 goto L_imaGFX;
             
             if(tPtr->tpos==0) { 
-L_imaGFX:       if(tb->prior) {
+            L_imaGFX:
+                if(tb->prior) {
                     tPtr->currentTextBlock = tb->prior;
                     if(tPtr->currentTextBlock->graphic)
                         tPtr->tpos = 1;
@@ -2367,7 +2369,8 @@ L_imaGFX:       if(tb->prior) {
             if(tb->graphic) 
                 goto R_imaGFX;
            if(tPtr->tpos == tb->used) {
-R_imaGFX:      if(tb->next) {
+           R_imaGFX:
+               if(tb->next) {
                     tPtr->currentTextBlock = tb->next;
                     tPtr->tpos = 0;
                     if(!tb->next->first && tb->next->used>0)
diff --git a/src/appicon.c b/src/appicon.c
index f11d3cb2..f965543c 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -48,7 +48,6 @@
 #include "xdnd.h"
 #endif
 #include "wsound.h"
-#include <WINGs/WINGsP.h>
 
 
 /*
diff --git a/src/balloon.c b/src/balloon.c
index 3b9e1a0e..85062a75 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -34,8 +34,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "screen.h"
 #include "texture.h"
diff --git a/src/defaults.c b/src/defaults.c
index df5f351f..a6961f12 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -51,8 +51,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "wcore.h"
 #include "framewin.h"
diff --git a/src/dock.c b/src/dock.c
index 127b13f2..168aa809 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -56,8 +56,6 @@
 #include "wsound.h"
 
 
-#include <WINGs/WINGsP.h>
-
 
 
 
diff --git a/src/framewin.c b/src/framewin.c
index 349bdada..b9b2d8cc 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -32,8 +32,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "GNUstep.h"
 #include "texture.h"
diff --git a/src/menu.c b/src/menu.c
index 54d679ba..8fa671d2 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -43,8 +43,6 @@
 #include "stacking.h"
 #include "text.h"
 
-#include <WINGs/WINGsP.h>
-
 
 /****** Global Variables ******/
 
diff --git a/src/text.c b/src/text.c
index 80bf821d..58889306 100644
--- a/src/text.c
+++ b/src/text.c
@@ -368,8 +368,7 @@ textRefresh(WTextInput *wtext)
         XFillRectangle(dpy, wtext->core->window, wtext->regGC,
                        x1, y1, x2-x1, y2-y1);
 
-        /* Draw the selected text... use invGC so it will be the
-         * opposite color as the filled rectangle */
+        /* Draw the selected text. Inverse bg and fg colors for selection */
         WMDrawImageString(scr->wmscreen, wtext->core->window,
                           scr->white, scr->black, wtext->font, x1, y1, ptr,
                           (ep - sp));
diff --git a/src/workspace.c b/src/workspace.c
index f760827c..5feeeae8 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -50,8 +50,6 @@
 #include "kwm.h"
 #endif
 
-#include <WINGs/WINGsP.h>
-
 
 extern WPreferences wPreferences;
 extern XContext wWinContext;