X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fdemo-Xm-widgets.c;h=80094ca53ebb63572c93c5bfe6e49d6a7f34f8a1;hp=63c3d9b0aea71a4f4a0e3f4a868db374bdce49a9;hb=06e9a7886a77cad92f9ddbc169d6d199a4d8b76d;hpb=14463b6ad1ab1ccf81f9c33350b048e410ba94cb

diff --git a/driver/demo-Xm-widgets.c b/driver/demo-Xm-widgets.c
index 63c3d9b0..80094ca5 100644
--- a/driver/demo-Xm-widgets.c
+++ b/driver/demo-Xm-widgets.c
@@ -33,17 +33,22 @@
 #include <Xm/TextF.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/CascadeBG.h>
-#ifdef HAVE_XMCOMBOBOX
-# include <Xm/ComboBox.h>
-#endif
 #include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/SelectioB.h>
 
+#ifdef HAVE_XMCOMBOBOX		/* a Motif 2.0 widget */
+# include <Xm/ComboBox.h>
+# ifndef XmNtextField		/* Lesstif 0.89.4 bug */
+#  undef HAVE_XMCOMBOBOX
+# endif
+#endif /* HAVE_XMCOMBOBOX */
+
 #include <stdio.h>
 
 
+
 const char *visual_menu[] = {
   "Any", "Best", "Default", "Default-N", "GL", "TrueColor", "PseudoColor",
   "StaticGray", "GrayScale", "DirectColor", "Color", "Gray", "Mono", 0 
@@ -504,9 +509,9 @@ create_options_page (Widget parent)
   fade_text = XmCreateTextField (preferences_form, "fadeSecondsText", av, ac);
   fade_ticks_text = XmCreateTextField (preferences_form, "fadeTicksText",
                                        av, ac);
-  lock_timeout_text = XmCreateTextField (preferences_form, "passwdText",
+  lock_timeout_text = XmCreateTextField (preferences_form, "lockText",
                                          av, ac);
-  passwd_timeout_text = XmCreateTextField (preferences_form, "lockText",
+  passwd_timeout_text = XmCreateTextField (preferences_form, "passwdText",
                                            av, ac);
   XtSetArg(av[ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++;
   verbose_toggle = XmCreateToggleButtonGadget (preferences_form,