From e4a53ba71e87b1389813a0e6f2866dd8df897f9f Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Thu, 28 Mar 2002 04:20:30 +0000
Subject: [PATCH] fixed some Bool flags passed to WINgs functions to always set
 1 or 0 values internally

---
 WINGs/ChangeLog           | 2 ++
 WINGs/Extras/wtableview.c | 2 +-
 WINGs/WINGs/WINGs.h       | 2 +-
 WINGs/connection.c        | 4 +++-
 WINGs/host.c              | 2 +-
 WINGs/wappresource.c      | 2 +-
 WINGs/wballoon.c          | 2 +-
 WINGs/wbrowser.c          | 6 ++++--
 WINGs/wbutton.c           | 4 ++--
 WINGs/wcolorwell.c        | 1 +
 WINGs/wfilepanel.c        | 6 +++---
 WINGs/wlabel.c            | 1 +
 WINGs/wlist.c             | 4 ++--
 WINGs/wmenuitem.c         | 2 +-
 WINGs/wpopupbutton.c      | 6 +++---
 WINGs/wslider.c           | 2 +-
 WINGs/wsplitview.c        | 2 +-
 WINGs/wtabview.c          | 4 ++--
 WINGs/wtextfield.c        | 6 +++---
 WINGs/wview.c             | 2 +-
 WINGs/wwindow.c           | 1 +
 21 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog
index 15217da9..d22292eb 100644
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -13,6 +13,8 @@ Changes since wmaker 0.80.0:
 - Fixed WMGetViewScreenPosition() to consider the window decorations.
 - Added ability to enable/disable individual WMTableViewItems.
 - Fixed textfields regarding interpretation of special keys with modifiers.
+- Fixed some functions that accept a boolean flag as a paramater, to set only
+  1 or 0 for the flag value, not the flag passed by the user.
 
 
 Changes since wmaker 0.70.0:
diff --git a/WINGs/Extras/wtableview.c b/WINGs/Extras/wtableview.c
index a99a9a59..3c173ff3 100644
--- a/WINGs/Extras/wtableview.c
+++ b/WINGs/Extras/wtableview.c
@@ -106,7 +106,7 @@ void WMSetTableColumnConstraints(WMTableColumn *column,
 
 void WMSetTableColumnEditable(WMTableColumn *column, Bool flag)
 {
-    column->editable = flag;
+    column->editable = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index be40a323..e069ff58 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -1650,7 +1650,7 @@ int WMGetTextInsertType(WMText *tPtr);
 
 //int WMGetCurrentTextBlock(WMText *tPtr);
 
-//void WMPrependTextBlock(WMText *tPtr, void *vtb);
+void WMPrependTextBlock(WMText *tPtr, void *vtb);
 
 void WMAppendTextBlock(WMText *tPtr, void *vtb);
 
diff --git a/WINGs/connection.c b/WINGs/connection.c
index a1d32c0b..ac82f80b 100644
--- a/WINGs/connection.c
+++ b/WINGs/connection.c
@@ -925,6 +925,8 @@ WMSetConnectionNonBlocking(WMConnection *cPtr, Bool flag)
 {
     wassertrv(cPtr!=NULL && cPtr->sock>=0, False);
 
+    flag = ((flag==0) ? 0 : 1);
+
     if (cPtr->isNonBlocking == flag)
         return True;
 
@@ -942,7 +944,7 @@ WMSetConnectionCloseOnExec(WMConnection *cPtr, Bool flag)
 {
     wassertrv(cPtr!=NULL && cPtr->sock>=0, False);
 
-    if (fcntl(cPtr->sock, F_SETFD, (flag ? FD_CLOEXEC : 0)) < 0) {
+    if (fcntl(cPtr->sock, F_SETFD, ((flag==0) ? 0 : FD_CLOEXEC)) < 0) {
         return False;
     }
 
diff --git a/WINGs/host.c b/WINGs/host.c
index b0dcaf2f..27c58f59 100644
--- a/WINGs/host.c
+++ b/WINGs/host.c
@@ -213,7 +213,7 @@ WMReleaseHost(WMHost *hPtr)
 void
 WMSetHostCacheEnabled(Bool flag)
 {
-    hostCacheEnabled = flag;
+    hostCacheEnabled = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wappresource.c b/WINGs/wappresource.c
index a35123cd..20f337e6 100644
--- a/WINGs/wappresource.c
+++ b/WINGs/wappresource.c
@@ -120,7 +120,7 @@ WMCreateApplicationIconBlendedPixmap(WMScreen *scr, RColor *color)
 void
 WMSetApplicationHasAppIcon(WMScreen *scr, Bool flag)
 {
-    scr->aflags.hasAppIcon = flag;
+    scr->aflags.hasAppIcon = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wballoon.c b/WINGs/wballoon.c
index f0c4e366..f09d644e 100644
--- a/WINGs/wballoon.c
+++ b/WINGs/wballoon.c
@@ -151,7 +151,7 @@ WMSetBalloonDelay(WMScreen *scr, int delay)
 void
 WMSetBalloonEnabled(WMScreen *scr, Bool flag)
 {
-    scr->balloon->flags.enabled = flag;
+    scr->balloon->flags.enabled = ((flag==0) ? 0 : 1);
 
     W_UnmapView(scr->balloon->view);
 }
diff --git a/WINGs/wbrowser.c b/WINGs/wbrowser.c
index 76186ce9..4b0972e6 100644
--- a/WINGs/wbrowser.c
+++ b/WINGs/wbrowser.c
@@ -156,7 +156,7 @@ WMSetBrowserAllowMultipleSelection(WMBrowser *bPtr, Bool flag)
 {
     int i;
 
-    bPtr->flags.allowMultipleSelection = flag ? 1 : 0;
+    bPtr->flags.allowMultipleSelection = ((flag==0) ? 0 : 1);
     for (i=0; i<bPtr->columnCount; i++) {
 	WMSetListAllowMultipleSelection(bPtr->columns[i], flag);
     }
@@ -168,7 +168,7 @@ WMSetBrowserAllowEmptySelection(WMBrowser *bPtr, Bool flag)
 {
     int i;
 
-    bPtr->flags.allowEmptySelection = flag ? 1 : 0;
+    bPtr->flags.allowEmptySelection = ((flag==0) ? 0 : 1);
     for (i=0; i<bPtr->columnCount; i++) {
 	WMSetListAllowEmptySelection(bPtr->columns[i], flag);
     }
@@ -423,6 +423,8 @@ WMSetBrowserTitled(WMBrowser *bPtr, Bool flag)
     int i;
     int columnX, columnY;
 
+    flag = ((flag==0) ? 0 : 1);
+
     if (bPtr->flags.isTitled == flag)
 	return;
 
diff --git a/WINGs/wbutton.c b/WINGs/wbutton.c
index fa83776d..926ce2fc 100644
--- a/WINGs/wbutton.c
+++ b/WINGs/wbutton.c
@@ -453,7 +453,7 @@ WMSetButtonFont(WMButton *bPtr, WMFont *font)
 void
 WMSetButtonEnabled(WMButton *bPtr, Bool flag)
 {
-    bPtr->flags.enabled = flag ? 1 : 0;
+    bPtr->flags.enabled = ((flag==0) ? 0 : 1);
 
     if (bPtr->view->flags.mapped) {
 	paintButton(bPtr);
@@ -560,7 +560,7 @@ WMGroupButtons(WMButton *bPtr, WMButton *newMember)
 void
 WMSetButtonContinuous(WMButton *bPtr, Bool flag)
 {
-    bPtr->flags.continuous = flag;
+    bPtr->flags.continuous = ((flag==0) ? 0 : 1);
     if (bPtr->timer) {
 	WMDeleteTimerHandler(bPtr->timer);
 	bPtr->timer = NULL;
diff --git a/WINGs/wcolorwell.c b/WINGs/wcolorwell.c
index 0475dfe2..83f13023 100644
--- a/WINGs/wcolorwell.c
+++ b/WINGs/wcolorwell.c
@@ -229,6 +229,7 @@ WMGetColorWellColor(WMColorWell *cPtr)
 void
 WSetColorWellBordered(WMColorWell *cPtr, Bool flag)
 {
+    flag = ((flag==0) ? 0 : 1);
     if (cPtr->flags.bordered != flag) {
 	cPtr->flags.bordered = flag;
 	W_ResizeView(cPtr->view, cPtr->view->size.width, cPtr->view->size.height);
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 35e915c5..c9b52220 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -451,20 +451,20 @@ WMSetFilePanelDirectory(WMFilePanel *panel, char *path)
 void
 WMSetFilePanelCanChooseDirectories(WMFilePanel *panel, Bool flag)
 {
-    panel->flags.canChooseDirectories = flag;
+    panel->flags.canChooseDirectories = ((flag==0) ? 0 : 1);
 }
 
 void
 WMSetFilePanelCanChooseFiles(WMFilePanel *panel, Bool flag)
 {
-    panel->flags.canChooseFiles = flag;
+    panel->flags.canChooseFiles = ((flag==0) ? 0 : 1);
 }
 
 
 void
 WMSetFilePanelAutoCompletion(WMFilePanel *panel, Bool flag)
 {
-    panel->flags.autoCompletion = flag;
+    panel->flags.autoCompletion = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wlabel.c b/WINGs/wlabel.c
index 67d543f1..d102ca95 100644
--- a/WINGs/wlabel.c
+++ b/WINGs/wlabel.c
@@ -192,6 +192,7 @@ WMSetLabelTextColor(WMLabel *lPtr, WMColor *color)
 void
 WMSetLabelWraps(WMLabel *lPtr, Bool flag)
 {
+    flag = ((flag==0) ? 0 : 1);
     if (lPtr->flags.noWrap != !flag) {
 	lPtr->flags.noWrap = !flag;
 	if (lPtr->view->flags.realized)
diff --git a/WINGs/wlist.c b/WINGs/wlist.c
index 56af1867..66f1b3b3 100644
--- a/WINGs/wlist.c
+++ b/WINGs/wlist.c
@@ -145,14 +145,14 @@ WMCreateList(WMWidget *parent)
 void
 WMSetListAllowMultipleSelection(WMList *lPtr, Bool flag)
 {
-    lPtr->flags.allowMultipleSelection = flag ? 1 : 0;
+    lPtr->flags.allowMultipleSelection = ((flag==0) ? 0 : 1);
 }
 
 
 void
 WMSetListAllowEmptySelection(WMList *lPtr, Bool flag)
 {
-    lPtr->flags.allowEmptySelection = flag ? 1 : 0;
+    lPtr->flags.allowEmptySelection = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wmenuitem.c b/WINGs/wmenuitem.c
index eb41ab8b..718e09f2 100644
--- a/WINGs/wmenuitem.c
+++ b/WINGs/wmenuitem.c
@@ -96,7 +96,7 @@ WMGetMenuItemEnabled(WMMenuItem *item)
 void
 WMSetMenuItemEnabled(WMMenuItem *item, Bool flag)
 {
-    item->flags.enabled = flag;
+    item->flags.enabled = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wpopupbutton.c b/WINGs/wpopupbutton.c
index c5066f5a..aeef16f6 100644
--- a/WINGs/wpopupbutton.c
+++ b/WINGs/wpopupbutton.c
@@ -192,7 +192,7 @@ WMRemovePopUpButtonItem(WMPopUpButton *bPtr, int index)
 void
 WMSetPopUpButtonEnabled(WMPopUpButton *bPtr, Bool flag)
 {
-    bPtr->flags.enabled = flag;
+    bPtr->flags.enabled = ((flag==0) ? 0 : 1);
     if (bPtr->view->flags.mapped)
 	paintPopUpButton(bPtr);
 }
@@ -252,7 +252,7 @@ WMSetPopUpButtonText(WMPopUpButton *bPtr, char *text)
 void 
 WMSetPopUpButtonItemEnabled(WMPopUpButton *bPtr, int index, Bool flag)
 {
-    WMSetMenuItemEnabled(WMGetFromArray(bPtr->items, index), flag);
+    WMSetMenuItemEnabled(WMGetFromArray(bPtr->items, index), (flag ? 1 : 0));
 }
 
 
@@ -266,7 +266,7 @@ WMGetPopUpButtonItemEnabled(WMPopUpButton *bPtr, int index)
 void
 WMSetPopUpButtonPullsDown(WMPopUpButton *bPtr, Bool flag)
 {
-    bPtr->flags.pullsDown = flag;
+    bPtr->flags.pullsDown = ((flag==0) ? 0 : 1);
     if (flag) {
 	bPtr->selectedItemIndex = -1;
     }
diff --git a/WINGs/wslider.c b/WINGs/wslider.c
index fc037805..65744521 100644
--- a/WINGs/wslider.c
+++ b/WINGs/wslider.c
@@ -219,7 +219,7 @@ WMSetSliderContinuous(WMSlider *slider, Bool flag)
 {
     CHECK_CLASS(slider, WC_Slider);
     
-    slider->flags.continuous = flag;
+    slider->flags.continuous = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wsplitview.c b/WINGs/wsplitview.c
index 4dfd8b04..78e287bd 100644
--- a/WINGs/wsplitview.c
+++ b/WINGs/wsplitview.c
@@ -837,7 +837,7 @@ WMSetSplitViewVertical(WMSplitView *sPtr, Bool flag)
     
     CHECK_CLASS(sPtr, WC_SplitView);
 
-    vertical = (flag) ? 1 : 0;
+    vertical = ((flag==0) ? 0 : 1);
     if (sPtr->flags.vertical == vertical)
     	return;
     
diff --git a/WINGs/wtabview.c b/WINGs/wtabview.c
index 4113b72b..674eefa6 100644
--- a/WINGs/wtabview.c
+++ b/WINGs/wtabview.c
@@ -276,7 +276,7 @@ WMAddItemInTabView(WMTabView *tPtr, WMTabViewItem *item)
 void
 WMSetTabViewEnabled(WMTabView *tPtr, Bool flag)
 {
-    tPtr->flags.enabled = (flag ? 1 : 0);
+    tPtr->flags.enabled = ((flag==0) ? 0 : 1);
     if (W_VIEW_REALIZED(tPtr->view))
 	paintTabView(tPtr);
 }
@@ -969,7 +969,7 @@ WMCreateTabViewItem(int identifier, char *label)
 void
 WMSetTabViewItemEnabled(WMTabViewItem *tPtr, Bool flag)
 {
-    tPtr->flags.enabled = (flag ? 1 : 0);
+    tPtr->flags.enabled = ((flag==0) ? 0 : 1);
     if (tPtr->tabView && W_VIEW_REALIZED(tPtr->tabView->view))
 	paintTabView(tPtr->tabView);
 }
diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c
index aa49f81c..2cbe9b12 100644
--- a/WINGs/wtextfield.c
+++ b/WINGs/wtextfield.c
@@ -527,7 +527,7 @@ WMSetTextFieldBeveled(WMTextField *tPtr, Bool flag)
 {
     CHECK_CLASS(tPtr, WC_TextField);
     
-    tPtr->flags.beveled = flag;
+    tPtr->flags.beveled = ((flag==0) ? 0 : 1);
 
     if (tPtr->view->flags.realized) {
 	paintTextField(tPtr);
@@ -541,7 +541,7 @@ WMSetTextFieldSecure(WMTextField *tPtr, Bool flag)
 {
     CHECK_CLASS(tPtr, WC_TextField);
     
-    tPtr->flags.secure = flag;
+    tPtr->flags.secure = ((flag==0) ? 0 : 1);
     
     if (tPtr->view->flags.realized) {
 	paintTextField(tPtr);
@@ -563,7 +563,7 @@ WMSetTextFieldEditable(WMTextField *tPtr, Bool flag)
 {
     CHECK_CLASS(tPtr, WC_TextField);
     
-    tPtr->flags.enabled = flag;
+    tPtr->flags.enabled = ((flag==0) ? 0 : 1);
     
     if (tPtr->view->flags.realized) {
 	paintTextField(tPtr);
diff --git a/WINGs/wview.c b/WINGs/wview.c
index df8b9902..c8a9d3b8 100644
--- a/WINGs/wview.c
+++ b/WINGs/wview.c
@@ -708,7 +708,7 @@ WMGetViewPosition(WMView *view)
 void
 WMSetViewNotifySizeChanges(WMView *view, Bool flag)
 {
-    view->flags.notifySizeChanged = flag;
+    view->flags.notifySizeChanged = ((flag==0) ? 0 : 1);
 }
 
 
diff --git a/WINGs/wwindow.c b/WINGs/wwindow.c
index 6f773f82..ac9e4d59 100644
--- a/WINGs/wwindow.c
+++ b/WINGs/wwindow.c
@@ -554,6 +554,7 @@ WMSetWindowLevel(WMWindow *win, int level)
 void
 WMSetWindowDocumentEdited(WMWindow *win, Bool flag)
 {
+    flag = ((flag==0) ? 0 : 1);
     if (win->flags.documentEdited != flag) {
 	win->flags.documentEdited = flag;
 	if (win->view->flags.realized)
-- 
2.11.4.GIT