gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-30 04:05:51 +01:00
Code Issues Projects Releases Wiki Activity

removed default autowrap from button and label

Browse Source
This commit is contained in:
kojima
2000-11-09 13:19:42 +00:00
parent 47e4e31ba0
commit 6bb9c58de1
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
WINGs/Makefile.am
View File

@@ -45,6 +45,7 @@ libWINGs_a_SOURCES = \
wapplication.c \ wapplication.c \
wappresource.c \ wappresource.c \
wballoon.c \ wballoon.c \
wbox.c \
wbrowser.c \ wbrowser.c \
wbutton.c \ wbutton.c \
wcolor.c \ wcolor.c \

2
WINGs/wbutton.c
View File

@@ -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), (bPtr->font!=NULL ? bPtr->font : scrPtr->normalFont),
relief, caption, bPtr->flags.alignment, image, relief, caption, bPtr->flags.alignment, image,
bPtr->flags.imagePosition, gc, offset); bPtr->flags.imagePosition, gc, offset);

1
WINGs/wlabel.c
View File

@@ -69,6 +69,7 @@ WMCreateLabel(WMWidget *parent)
lPtr->flags.alignment = DEFAULT_ALIGNMENT; lPtr->flags.alignment = DEFAULT_ALIGNMENT;
lPtr->flags.relief = DEFAULT_RELIEF; lPtr->flags.relief = DEFAULT_RELIEF;
lPtr->flags.imagePosition = DEFAULT_IMAGE_POSITION; lPtr->flags.imagePosition = DEFAULT_IMAGE_POSITION;
lPtr->flags.noWrap = 1;
return lPtr; return lPtr;
} }

2
WINGs/wscrollview.c
View File

@@ -163,7 +163,7 @@ reorganizeInterior(WMScrollView *sPtr)
W_ResizeView(sPtr->viewport, cw, ch); W_ResizeView(sPtr->viewport, cw, ch);
W_MoveView(sPtr->viewport, cx, cy); W_MoveView(sPtr->viewport, cx, cy);
if (sPtr->flags.hasHScroller) { if (sPtr->flags.hasHScroller) {
WMResizeWidget(sPtr->hScroller, hw, 20); WMResizeWidget(sPtr->hScroller, hw, 20);
WMMoveWidget(sPtr->hScroller, hx, hy); WMMoveWidget(sPtr->hScroller, hx, hy);