- removed unnecessary include of WINGsP.h in some places

- smaller space between rows of text in WMText

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);

WINGs/wtext.c

@@ -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)

src/appicon.c

@@ -48,7 +48,6 @@
 #include "xdnd.h"
 #endif
 #include "wsound.h"
-#include <WINGs/WINGsP.h>
 
 
 /*

src/balloon.c

@@ -34,8 +34,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "screen.h"
 #include "texture.h"

src/defaults.c

@@ -51,8 +51,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "wcore.h"
 #include "framewin.h"

src/dock.c

@@ -56,8 +56,6 @@
 #include "wsound.h"
 
 
-#include <WINGs/WINGsP.h>
-
 
 
 

src/framewin.c

@@ -32,8 +32,6 @@
 
 #include <wraster.h>
 
-#include <WINGs/WINGsP.h>
-
 #include "WindowMaker.h"
 #include "GNUstep.h"
 #include "texture.h"

src/menu.c

@@ -43,8 +43,6 @@
 #include "stacking.h"
 #include "text.h"
 
-#include <WINGs/WINGsP.h>
-
 
 /****** Global Variables ******/
 

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));

src/workspace.c

@@ -50,8 +50,6 @@
 #include "kwm.h"
 #endif
 
-#include <WINGs/WINGsP.h>
-
 
 extern WPreferences wPreferences;
 extern XContext wWinContext;