From 6bb9c58de169ea3395a1157399b63a7dda23b107 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Thu, 9 Nov 2000 13:19:42 +0000
Subject: [PATCH] removed default autowrap from button and label

---
 WINGs/Makefile.am   | 1 +
 WINGs/wbutton.c     | 2 +-
 WINGs/wlabel.c      | 1 +
 WINGs/wscrollview.c | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 0b189b85..9bd8c934 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -45,6 +45,7 @@ libWINGs_a_SOURCES = 	\
 	wapplication.c \
 	wappresource.c \
 	wballoon.c \
+	wbox.c \
 	wbrowser.c \
 	wbutton.c \
 	wcolor.c \
diff --git a/WINGs/wbutton.c b/WINGs/wbutton.c
index 1235c7ae..69e3e76a 100644
--- a/WINGs/wbutton.c
+++ b/WINGs/wbutton.c
@@ -650,7 +650,7 @@ paintButton(Button *bPtr)
 	}
     }
 
-    W_PaintTextAndImage(bPtr->view, True, WMColorGC(textColor),
+    W_PaintTextAndImage(bPtr->view, False, WMColorGC(textColor),
 			(bPtr->font!=NULL ? bPtr->font : scrPtr->normalFont),
 			relief, caption, bPtr->flags.alignment, image, 
 			bPtr->flags.imagePosition, gc, offset);
diff --git a/WINGs/wlabel.c b/WINGs/wlabel.c
index b6d30b8e..ab5704d6 100644
--- a/WINGs/wlabel.c
+++ b/WINGs/wlabel.c
@@ -69,6 +69,7 @@ WMCreateLabel(WMWidget *parent)
     lPtr->flags.alignment = DEFAULT_ALIGNMENT;
     lPtr->flags.relief = DEFAULT_RELIEF;
     lPtr->flags.imagePosition = DEFAULT_IMAGE_POSITION;
+    lPtr->flags.noWrap = 1;
 
     return lPtr;
 }
diff --git a/WINGs/wscrollview.c b/WINGs/wscrollview.c
index 4a0cb92d..4dae0f70 100644
--- a/WINGs/wscrollview.c
+++ b/WINGs/wscrollview.c
@@ -163,7 +163,7 @@ reorganizeInterior(WMScrollView *sPtr)
 
     W_ResizeView(sPtr->viewport, cw, ch);
     W_MoveView(sPtr->viewport, cx, cy);
-    
+        
     if (sPtr->flags.hasHScroller) {
 	WMResizeWidget(sPtr->hScroller, hw, 20);
 	WMMoveWidget(sPtr->hScroller, hx, hy);
-- 
2.11.4.GIT