From 99e67c8ed08c451899859e30b40ffbcc3b3d2111 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Fri, 30 Apr 1999 02:36:33 +0000
Subject: [PATCH] Small bug fix, and updated for some #defines that were
 removed.

---
 WPrefs.app/Preferences.c | 12 ++++++------
 util/wmsetbg.c           |  8 ++++----
 wrlib/scale.c            |  2 +-
 wrlib/wraster.h          |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index d95ceba5..512d63a3 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -158,9 +158,9 @@ createPanel(Panel *p)
     WMMoveWidget(panel->sizeF, 20, 10);
     WMSetFrameTitle(panel->sizeF, _("Size Display"));
 
-    WMSetBalloonTextForView(WMWidgetView(panel->posiF),
-			    _("The position or style of the window size\n"
-			      "display that's shown when a window is resized."));
+    WMSetBalloonTextForView(_("The position or style of the window size\n"
+                              "display that's shown when a window is resized."),
+                            WMWidgetView(panel->posiF));
 
     panel->sizeP = WMCreatePopUpButton(panel->sizeF);
     WMResizeWidget(panel->sizeP, 180, 20);
@@ -178,9 +178,9 @@ createPanel(Panel *p)
     WMMoveWidget(panel->posiF, 20, 75);
     WMSetFrameTitle(panel->posiF, _("Position Display"));
 
-    WMSetBalloonTextForView(WMWidgetView(panel->posiF),
-			    _("The position or style of the window position\n"
-			      "display that's shown when a window is moved."));
+    WMSetBalloonTextForView(_("The position or style of the window position\n"
+                              "display that's shown when a window is moved."),
+                            WMWidgetView(panel->posiF));
 
     panel->posiP = WMCreatePopUpButton(panel->posiF);
     WMResizeWidget(panel->posiP, 180, 20);
diff --git a/util/wmsetbg.c b/util/wmsetbg.c
index f7eded42..f567aee3 100644
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -1218,7 +1218,7 @@ main(int argc, char **argv)
     char *back_color = "gray20";
     char *image_name = NULL;
     char *domain = "WindowMaker";
-    int update=0, cpc=4, render_mode=RM_DITHER, obey_user=0;
+    int update=0, cpc=4, render_mode=RDitheredRendering, obey_user=0;
     char *texture = NULL;
     int workspace = -1;
     
@@ -1259,11 +1259,11 @@ main(int argc, char **argv)
 	    style = "mpixmap";	    
 	} else if (strcmp(argv[i], "-d")==0
 		   || strcmp(argv[i], "--dither")==0) {
-	    render_mode = RM_DITHER;
+	    render_mode = RDitheredRendering;
 	    obey_user++;
 	} else if (strcmp(argv[i], "-m")==0
 		   || strcmp(argv[i], "--match")==0) {
-	    render_mode = RM_MATCH;
+	    render_mode = RBestMatchRendering;
 	    obey_user++;
 	} else if (strcmp(argv[i], "-S")==0
 		   || strcmp(argv[i], "--smooth")==0) {
@@ -1362,7 +1362,7 @@ main(int argc, char **argv)
     scrHeight = HeightOfScreen(DefaultScreenOfDisplay(dpy));
 
     if (!obey_user && DefaultDepth(dpy, scr) <= 8)
-        render_mode = RM_DITHER;
+        render_mode = RDitheredRendering;
 
     rattr.flags = RC_RenderMode | RC_ColorsPerChannel | RC_DefaultVisual;
     rattr.render_mode = render_mode;
diff --git a/wrlib/scale.c b/wrlib/scale.c
index 15291aeb..3c841723 100644
--- a/wrlib/scale.c
+++ b/wrlib/scale.c
@@ -29,7 +29,7 @@
 #include <math.h>
 
 #ifndef PI
-#define PI 	3.131592
+#define PI 	3.141592
 #endif
 
 #include <assert.h>
diff --git a/wrlib/wraster.h b/wrlib/wraster.h
index cef890a9..a3702832 100644
--- a/wrlib/wraster.h
+++ b/wrlib/wraster.h
@@ -50,7 +50,7 @@
 #include <X11/extensions/XShm.h>
 #endif
 
-/* RM_MATCH or RM_DITHER */
+/* RBestMatchRendering or RDitheredRendering */
 #define RC_RenderMode 		(1<<0)
 
 /* number of colors per channel for colormap in PseudoColor mode */
-- 
2.11.4.GIT