summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xc/lib/Xaw/AsciiSink.c5
-rw-r--r--xc/lib/Xaw/AsciiSrc.c4
-rw-r--r--xc/lib/Xaw/AsciiText.c4
-rw-r--r--xc/lib/Xaw/Box.c5
-rw-r--r--xc/lib/Xaw/Command.c24
-rw-r--r--xc/lib/Xaw/Dialog.c5
-rw-r--r--xc/lib/Xaw/Form.c4
-rw-r--r--xc/lib/Xaw/Grip.c5
-rw-r--r--xc/lib/Xaw/Label.c4
-rw-r--r--xc/lib/Xaw/List.c5
-rw-r--r--xc/lib/Xaw/MenuButton.c5
-rw-r--r--xc/lib/Xaw/Paned.c6
-rw-r--r--xc/lib/Xaw/Scrollbar.c4
-rw-r--r--xc/lib/Xaw/Simple.c19
-rw-r--r--xc/lib/Xaw/SimpleMenu.c6
-rw-r--r--xc/lib/Xaw/Sme.c5
-rw-r--r--xc/lib/Xaw/SmeBSB.c6
-rw-r--r--xc/lib/Xaw/SmeLine.c6
-rw-r--r--xc/lib/Xaw/StripChart.c5
-rw-r--r--xc/lib/Xaw/Text.c5
-rw-r--r--xc/lib/Xaw/TextSink.c5
-rw-r--r--xc/lib/Xaw/TextSrc.c5
-rw-r--r--xc/lib/Xaw/Toggle.c5
-rw-r--r--xc/lib/Xaw/Vendor.c4
-rw-r--r--xc/lib/Xaw/Viewport.c5
-rw-r--r--xc/programs/xclock/Clock.c4
-rw-r--r--xc/programs/xlogo/Logo.c5
-rw-r--r--xc/unsupported/programs/xbiff/Mailbox.c4
28 files changed, 100 insertions, 69 deletions
diff --git a/xc/lib/Xaw/AsciiSink.c b/xc/lib/Xaw/AsciiSink.c
index fb5cf52ad..6a8164ea9 100644
--- a/xc/lib/Xaw/AsciiSink.c
+++ b/xc/lib/Xaw/AsciiSink.c
@@ -1,5 +1,5 @@
#if (!defined(lint) && !defined(SABER))
-static char Xrcsid[] = "$XConsortium: AsciiSink.c,v 1.44 89/10/03 11:37:33 jim Exp $";
+static char Xrcsid[] = "$XConsortium: AsciiSink.c,v 1.45 89/10/04 13:56:19 kit Exp $";
#endif /* lint && SABER */
/***********************************************************
@@ -33,6 +33,7 @@ SOFTWARE.
#include <X11/Xatom.h>
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/AsciiSinkP.h>
#include <X11/Xaw/AsciiSrcP.h> /* For source function defs. */
#include <X11/Xaw/TextP.h> /* I also reach into the text widget. */
@@ -66,7 +67,7 @@ AsciiSinkClassRec asciiSinkClassRec = {
/* superclass */ (WidgetClass) SuperClass,
/* class_name */ "AsciiSink",
/* widget_size */ sizeof(AsciiSinkRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/AsciiSrc.c b/xc/lib/Xaw/AsciiSrc.c
index 4fac6b51e..7f013462a 100644
--- a/xc/lib/Xaw/AsciiSrc.c
+++ b/xc/lib/Xaw/AsciiSrc.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: AsciiSrc.c,v 1.21 89/10/05 13:17:09 kit Exp $";
+static char Xrcsid[] = "$XConsortium: AsciiSrc.c,v 1.22 89/10/05 19:31:56 kit Exp $";
#endif
/*
@@ -37,6 +37,7 @@ static char Xrcsid[] = "$XConsortium: AsciiSrc.c,v 1.21 89/10/05 13:17:09 kit Ex
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/AsciiSrcP.h>
#include <X11/Xmu/Misc.h>
#include <X11/Xmu/CharSet.h>
@@ -162,6 +163,7 @@ WidgetClass asciiSrcObjectClass = (WidgetClass)&asciiSrcClassRec;
static void
ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRAsciiType, CvtStringToAsciiType,
NULL, (Cardinal) 0);
}
diff --git a/xc/lib/Xaw/AsciiText.c b/xc/lib/Xaw/AsciiText.c
index 54f2dcd96..74309141d 100644
--- a/xc/lib/Xaw/AsciiText.c
+++ b/xc/lib/Xaw/AsciiText.c
@@ -1,5 +1,5 @@
#if (!defined(lint) && !defined(SABER))
-static char Xrcsid[] = "$XConsortium: AsciiText.c,v 1.33 89/10/02 19:15:21 kit Exp $";
+static char Xrcsid[] = "$XConsortium: AsciiText.c,v 1.34 89/10/04 13:55:41 kit Exp $";
#endif /* lint && SABER */
/***********************************************************
@@ -50,6 +50,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/AsciiSrc.h>
#include <X11/Xaw/AsciiSink.h>
#include <X11/Xaw/AsciiTextP.h>
@@ -105,6 +106,7 @@ WidgetClass asciiTextWidgetClass = (WidgetClass)&asciiTextClassRec;
static void
ClassInitialize()
{
+ XawInitializeWidgetSet();
asciiTextClassRec.core_class.num_actions = textActionsTableCount;
}
diff --git a/xc/lib/Xaw/Box.c b/xc/lib/Xaw/Box.c
index 85311d7bb..284c2515f 100644
--- a/xc/lib/Xaw/Box.c
+++ b/xc/lib/Xaw/Box.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Box.c,v 1.39 89/05/11 01:04:44 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Box.c,v 1.40 89/09/19 16:29:23 kit Exp $";
#endif /* lint */
@@ -36,6 +36,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <X11/Xmu/Misc.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/BoxP.h>
/****************************************************************
@@ -71,7 +72,7 @@ BoxClassRec boxClassRec = {
/* superclass */ (WidgetClass) &compositeClassRec,
/* class_name */ "Box",
/* widget_size */ sizeof(BoxRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_init */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/Command.c b/xc/lib/Xaw/Command.c
index 5f87a4a5d..b734eecc6 100644
--- a/xc/lib/Xaw/Command.c
+++ b/xc/lib/Xaw/Command.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Command.c,v 1.61 89/10/03 16:14:05 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Command.c,v 1.62 89/10/05 17:53:21 jim Exp $";
#endif /* lint */
/***********************************************************
@@ -39,6 +39,7 @@ SOFTWARE.
#include <X11/Xmu/Misc.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/CommandP.h>
#ifdef SHAPE
@@ -126,11 +127,7 @@ CommandClassRec commandClassRec = {
(WidgetClass) SuperClass, /* superclass */
"Command", /* class_name */
sizeof(CommandRec), /* size */
-#ifdef SHAPE
ClassInitialize, /* class_initialize */
-#else
- NULL, /* class_initialize */
-#endif /*SHAPE*/
NULL, /* class_part_initialize */
FALSE, /* class_inited */
Initialize, /* initialize */
@@ -558,6 +555,17 @@ Widget current, request, new;
return (redisplay);
}
+static void ClassInitialize()
+{
+ XawInitializeWidgetSet();
+#ifdef SHAPE
+ XtSetTypeConverter( XtRString, XtRShapeStyle, XmuCvtStringToShapeStyle,
+ NULL, 0, XtCacheNone, NULL );
+#endif
+}
+
+
+
#ifdef SHAPE
static Boolean
@@ -582,12 +590,6 @@ CommandWidget cbw;
return(TRUE);
}
-static void ClassInitialize()
-{
- XtSetTypeConverter( XtRString, XtRShapeStyle, XmuCvtStringToShapeStyle,
- NULL, 0, XtCacheNone, NULL );
-}
-
static void Realize(w, valueMask, attributes)
Widget w;
Mask *valueMask;
diff --git a/xc/lib/Xaw/Dialog.c b/xc/lib/Xaw/Dialog.c
index 7a4c0e1ea..3b688858e 100644
--- a/xc/lib/Xaw/Dialog.c
+++ b/xc/lib/Xaw/Dialog.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Dialog.c,v 1.32 89/08/25 18:35:32 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Dialog.c,v 1.33 89/08/28 12:14:04 kit Exp $";
#endif /* lint */
@@ -38,6 +38,7 @@ SOFTWARE.
#include <X11/StringDefs.h>
#include <X11/Xmu/Misc.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/AsciiText.h>
#include <X11/Xaw/Command.h>
#include <X11/Xaw/Label.h>
@@ -64,7 +65,7 @@ DialogClassRec dialogClassRec = {
/* superclass */ (WidgetClass) &formClassRec,
/* class_name */ "Dialog",
/* widget_size */ sizeof(DialogRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part init */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/Form.c b/xc/lib/Xaw/Form.c
index 93dfecde3..83b1655f7 100644
--- a/xc/lib/Xaw/Form.c
+++ b/xc/lib/Xaw/Form.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Form.c,v 1.31 89/10/05 19:24:37 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Form.c,v 1.32 89/10/06 13:48:12 kit Exp $";
#endif /* lint */
@@ -31,6 +31,7 @@ SOFTWARE.
#include <X11/StringDefs.h>
#include <X11/Xmu/Converters.h>
#include <X11/Xmu/CharSet.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/FormP.h>
/* Private Definitions */
@@ -193,6 +194,7 @@ static void ClassInitialize()
static XtConvertArgRec parentCvtArgs[] = {
{XtBaseOffset, (caddr_t)XtOffset(Widget, core.parent), sizeof(Widget)}
};
+ XawInitializeWidgetSet();
XtQChainLeft = XrmStringToQuark("chainleft");
XtQChainRight = XrmStringToQuark("chainright");
XtQChainTop = XrmStringToQuark("chaintop");
diff --git a/xc/lib/Xaw/Grip.c b/xc/lib/Xaw/Grip.c
index e50bf3d18..2062b694f 100644
--- a/xc/lib/Xaw/Grip.c
+++ b/xc/lib/Xaw/Grip.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Grip.c,v 1.24 89/03/30 16:53:50 jim Exp $";
+static char Xrcsid[] = "$XConsortium: Grip.c,v 1.25 89/05/11 01:05:23 kit Exp $";
#endif /* lint */
/***********************************************************
@@ -32,6 +32,7 @@ SOFTWARE.
*/
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/GripP.h>
static XtResource resources[] = {
@@ -65,7 +66,7 @@ GripClassRec gripClassRec = {
/* superclass */ (WidgetClass) SuperClass,
/* class name */ "Grip",
/* size */ sizeof(GripRec),
- /* class initialize */ NULL,
+ /* class initialize */ XawInitializeWidgetSet,
/* class_part_init */ NULL,
/* class_inited */ FALSE,
/* initialize */ NULL,
diff --git a/xc/lib/Xaw/Label.c b/xc/lib/Xaw/Label.c
index 40d221837..00c866e1d 100644
--- a/xc/lib/Xaw/Label.c
+++ b/xc/lib/Xaw/Label.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Label.c,v 1.70 89/07/10 17:33:27 dschmidt Exp $";
+static char Xrcsid[] = "$XConsortium: Label.c,v 1.71 89/09/07 17:54:39 swick Exp $";
#endif /* lint */
@@ -38,6 +38,7 @@ SOFTWARE.
#include <ctype.h>
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/LabelP.h>
/****************************************************************
@@ -130,6 +131,7 @@ static void ClassInitialize()
{XtWidgetBaseOffset, (caddr_t) XtOffset(Widget, core.screen),
sizeof(Screen *)}
};
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify, NULL, 0 );
XtAddConverter("String", "Pixmap", XmuCvtStringToPixmap,
screenConvertArg, XtNumber(screenConvertArg));
diff --git a/xc/lib/Xaw/List.c b/xc/lib/Xaw/List.c
index 554b75636..647f83689 100644
--- a/xc/lib/Xaw/List.c
+++ b/xc/lib/Xaw/List.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER))
- static char Xrcs_id[] = "$XConsortium: List.c,v 1.20 89/07/16 14:44:23 jim Exp $";
+ static char Xrcs_id[] = "$XConsortium: List.c,v 1.21 89/08/24 17:57:39 kit Exp $";
#endif
/***********************************************************
@@ -49,6 +49,7 @@ SOFTWARE.
#include <X11/Xmu/Drawing.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/ListP.h>
@@ -126,7 +127,7 @@ ListClassRec listClassRec = {
/* superclass */ (WidgetClass) superclass,
/* class_name */ "List",
/* widget_size */ sizeof(ListRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/MenuButton.c b/xc/lib/Xaw/MenuButton.c
index bdbc33fce..b5428c6bc 100644
--- a/xc/lib/Xaw/MenuButton.c
+++ b/xc/lib/Xaw/MenuButton.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: MenuButton.c,v 1.8 89/07/12 13:50:09 kit Exp $";
+static char Xrcsid[] = "$XConsortium: MenuButton.c,v 1.9 89/10/02 19:19:01 keith Exp $";
#endif /* lint */
/***********************************************************
@@ -49,6 +49,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/MenuButtoP.h>
static void Realize();
@@ -94,7 +95,7 @@ MenuButtonClassRec menuButtonClassRec = {
(WidgetClass) superclass, /* superclass */
"MenuButton", /* class_name */
sizeof(MenuButtonRec), /* size */
- NULL, /* class_initialize */
+ XawInitializeWidgetSet, /* class_initialize */
NULL, /* class_part_initialize */
FALSE, /* class_inited */
NULL, /* initialize */
diff --git a/xc/lib/Xaw/Paned.c b/xc/lib/Xaw/Paned.c
index e0d8ee3ba..c410cb068 100644
--- a/xc/lib/Xaw/Paned.c
+++ b/xc/lib/Xaw/Paned.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Paned.c,v 1.10 89/09/19 16:30:27 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Paned.c,v 1.11 89/10/07 15:16:49 kit Exp $";
#endif /* lint */
@@ -48,6 +48,7 @@ SOFTWARE.
#include <X11/Xmu/Misc.h>
#include <X11/Xmu/Converters.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/Grip.h>
#include <X11/Xaw/PanedP.h>
@@ -187,7 +188,7 @@ PanedClassRec panedClassRec = {
/* superclass */ (WidgetClass) SuperClass,
/* class name */ "Paned",
/* size */ sizeof(PanedRec),
- /* class initialize */ ClassInitialize,
+ /* class_initialize */ ClassInitialize,
/* class_part init */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
@@ -1396,6 +1397,7 @@ PanedWidget pw;
static void
ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtROrientation, XmuCvtStringToOrientation,
NULL, (Cardinal)0 );
}
diff --git a/xc/lib/Xaw/Scrollbar.c b/xc/lib/Xaw/Scrollbar.c
index c076ac77a..8620ea975 100644
--- a/xc/lib/Xaw/Scrollbar.c
+++ b/xc/lib/Xaw/Scrollbar.c
@@ -1,6 +1,6 @@
#ifndef lint
static char Xrcsid[] =
- "$XConsortium: Scroll.c,v 1.50 89/08/24 16:37:39 kit Exp $";
+ "$XConsortium: Scroll.c,v 1.51 89/08/24 17:49:49 kit Exp $";
#endif /* lint */
/***********************************************************
@@ -34,6 +34,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/ScrollP.h>
/* Private definitions. */
@@ -161,6 +162,7 @@ WidgetClass scrollbarWidgetClass = (WidgetClass)&scrollbarClassRec;
static void ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtROrientation, XmuCvtStringToOrientation,
NULL, (Cardinal)0 );
}
diff --git a/xc/lib/Xaw/Simple.c b/xc/lib/Xaw/Simple.c
index 5a07377b2..6a85e96c9 100644
--- a/xc/lib/Xaw/Simple.c
+++ b/xc/lib/Xaw/Simple.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Simple.c,v 1.19 89/05/02 12:58:13 swick Exp $";
+static char Xrcsid[] = "$XConsortium: Simple.c,v 1.20 89/05/11 01:06:21 kit Exp $";
#endif /* lint */
/***********************************************************
@@ -28,8 +28,8 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/SimpleP.h>
-#include <X11/Vendor.h> /* hack; force Xaw/Vendor.o to be loaded */
#define UnspecifiedPixmap 2 /* %%% should be NULL, according to the spec */
@@ -42,7 +42,7 @@ static XtResource resources[] = {
#undef offset
};
-static void ClassInitialize(), ClassPartInitialize(), Realize();
+static void ClassPartInitialize(), Realize();
static Boolean SetValues(), ChangeSensitive();
SimpleClassRec simpleClassRec = {
@@ -50,7 +50,7 @@ SimpleClassRec simpleClassRec = {
/* superclass */ (WidgetClass) &widgetClassRec,
/* class_name */ "Simple",
/* widget_size */ sizeof(SimpleRec),
- /* class_initialize */ ClassInitialize,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ ClassPartInitialize,
/* class_inited */ FALSE,
/* initialize */ NULL,
@@ -87,17 +87,6 @@ SimpleClassRec simpleClassRec = {
WidgetClass simpleWidgetClass = (WidgetClass)&simpleClassRec;
-static void ClassInitialize()
-{
- /* this silliness causes the linker to include the VendorShell
- * module from Xaw, rather than the one from Xt. Better
- * optimizers require bigger hacks to hide the fact that this
- * is a no-op.
- */
- if (vendorShellWidgetClass == NULL)
- simpleClassRec.simple_class.change_sensitive = ChangeSensitive;
-}
-
static void ClassPartInitialize(class)
WidgetClass class;
{
diff --git a/xc/lib/Xaw/SimpleMenu.c b/xc/lib/Xaw/SimpleMenu.c
index 653259a36..091ed63e9 100644
--- a/xc/lib/Xaw/SimpleMenu.c
+++ b/xc/lib/Xaw/SimpleMenu.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: SimpleMenu.c,v 1.25 89/10/05 17:50:30 kit Exp $";
+static char Xrcsid[] = "$XConsortium: SimpleMenu.c,v 1.26 89/10/06 18:38:15 jim Exp $";
#endif
/***********************************************************
@@ -40,6 +40,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/SimpleMenP.h>
#include <X11/Xaw/BSBMenuEnt.h>
#include <X11/Xaw/Cardinals.h>
@@ -142,7 +143,7 @@ SimpleMenuClassRec simpleMenuClassRec = {
/* superclass */ (WidgetClass) superclass,
/* class_name */ "SimpleMenu",
/* size */ sizeof(SimpleMenuRec),
- /* Class Initializer */ ClassInitialize,
+ /* class_initialize */ ClassInitialize,
/* class_part_initialize*/ ClassPartInitialize,
/* Class init'ed */ FALSE,
/* initialize */ Initialize,
@@ -203,6 +204,7 @@ WidgetClass simpleMenuWidgetClass = (WidgetClass)&simpleMenuClassRec;
static void
ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRBackingStore, XmuCvtStringToBackingStore,
NULL, 0 );
XmuAddInitializer( AddPositionAction, NULL);
diff --git a/xc/lib/Xaw/Sme.c b/xc/lib/Xaw/Sme.c
index 5181f6b9b..f9b833e3b 100644
--- a/xc/lib/Xaw/Sme.c
+++ b/xc/lib/Xaw/Sme.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: MenuEntry.c,v 1.1 89/09/28 16:44:49 kit Exp $";
+static char Xrcsid[] = "$XConsortium: MenuEntry.c,v 1.2 89/09/29 19:03:48 kit Exp $";
#endif
/***********************************************************
@@ -40,6 +40,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/MenuEntryP.h>
#include <X11/Xaw/Cardinals.h>
@@ -64,7 +65,7 @@ MenuEntryClassRec menuEntryClassRec = {
/* superclass */ (WidgetClass) SUPERCLASS,
/* class_name */ "MenuEntry",
/* size */ sizeof(MenuEntryRec),
- /* Class Initializer */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize*/ ClassPartInitialize,
/* Class init'ed */ FALSE,
/* initialize */ NULL,
diff --git a/xc/lib/Xaw/SmeBSB.c b/xc/lib/Xaw/SmeBSB.c
index c65d682bb..6063b071d 100644
--- a/xc/lib/Xaw/SmeBSB.c
+++ b/xc/lib/Xaw/SmeBSB.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: BSBMenuEnt.c,v 1.3 89/10/03 16:42:01 kit Exp $";
+static char Xrcsid[] = "$XConsortium: BSBMenuEnt.c,v 1.4 89/10/05 17:50:36 kit Exp $";
#endif
/***********************************************************
@@ -42,6 +42,7 @@ SOFTWARE.
#include <X11/Xmu/Drawing.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/SimpleMenu.h>
#include <X11/Xaw/BSBMenuEnP.h>
#include <X11/Xaw/Cardinals.h>
@@ -94,7 +95,7 @@ BSBMenuEntryClassRec bSBMenuEntryClassRec = {
/* superclass */ (WidgetClass) superclass,
/* class_name */ "BSBMenuEntry",
/* size */ sizeof(BSBMenuEntryRec),
- /* Class Initializer */ ClassInitialize,
+ /* class_initializer */ ClassInitialize,
/* class_part_initialize*/ NULL,
/* Class init'ed */ FALSE,
/* initialize */ Initialize,
@@ -154,6 +155,7 @@ WidgetClass bSBMenuEntryObjectClass = (WidgetClass) &bSBMenuEntryClassRec;
static void
ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRJustify, XmuCvtStringToJustify, NULL, 0 );
}
diff --git a/xc/lib/Xaw/SmeLine.c b/xc/lib/Xaw/SmeLine.c
index 6c915104c..f961a43f5 100644
--- a/xc/lib/Xaw/SmeLine.c
+++ b/xc/lib/Xaw/SmeLine.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: LineMenuEn.c,v 1.1 89/09/29 19:04:03 kit Exp $";
+static char Xrcsid[] = "$XConsortium: LineMenuEn.c,v 1.2 89/10/02 19:12:57 kit Exp $";
#endif
/***********************************************************
@@ -40,6 +40,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/LineMenuEP.h>
#include <X11/Xaw/Cardinals.h>
@@ -71,7 +72,7 @@ LineMenuEntryClassRec lineMenuEntryClassRec = {
/* superclass */ (WidgetClass) SUPERCLASS,
/* class_name */ "LineMenuEntry",
/* size */ sizeof(LineMenuEntryRec),
- /* Class Initializer */ ClassInitialize,
+ /* class_initialize */ ClassInitialize,
/* class_part_initialize*/ NULL,
/* Class init'ed */ FALSE,
/* initialize */ Initialize,
@@ -135,6 +136,7 @@ ClassInitialize()
sizeof(Screen *)}
};
+ XawInitializeWidgetSet();
XtAddConverter(XtRString, XtRPixmap, XmuCvtStringToPixmap,
screenConvertArg, XtNumber(screenConvertArg));
}
diff --git a/xc/lib/Xaw/StripChart.c b/xc/lib/Xaw/StripChart.c
index 2967da84c..f56730f29 100644
--- a/xc/lib/Xaw/StripChart.c
+++ b/xc/lib/Xaw/StripChart.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: StripChart.c,v 1.4 89/08/24 15:24:15 kit Exp $";
+static char Xrcsid[] = "$XConsortium: StripChart.c,v 1.5 89/09/14 17:01:11 kit Exp $";
#endif
/***********************************************************
@@ -29,6 +29,7 @@ SOFTWARE.
#include <stdio.h>
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/StripCharP.h>
#define MS_PER_SEC 1000
@@ -67,7 +68,7 @@ StripChartClassRec stripChartClassRec = {
/* superclass */ (WidgetClass) &simpleClassRec,
/* class_name */ "StripChart",
/* size */ sizeof(StripChartRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/Text.c b/xc/lib/Xaw/Text.c
index 1b544204d..bcaaac237 100644
--- a/xc/lib/Xaw/Text.c
+++ b/xc/lib/Xaw/Text.c
@@ -1,5 +1,5 @@
#if (!defined(lint) && !defined(SABER))
-static char Xrcsid[] = "$XConsortium: Text.c,v 1.116 89/09/13 14:41:51 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Text.c,v 1.117 89/09/15 12:09:13 kit Exp $";
#endif /* lint && SABER */
/***********************************************************
@@ -38,6 +38,7 @@ SOFTWARE.
#include <X11/Xmu/StdSel.h>
#include <X11/Xmu/Misc.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/Cardinals.h>
#include <X11/Xaw/Scroll.h>
#include <X11/Xaw/TextP.h>
@@ -301,6 +302,8 @@ ClassInitialize()
char *buf = XtMalloc (len1 + len2 + len3 + 1);
char *cp = buf;
+ XawInitializeWidgetSet();
+
/*
* Set the number of actions.
*/
diff --git a/xc/lib/Xaw/TextSink.c b/xc/lib/Xaw/TextSink.c
index e07dae987..fb619eaa3 100644
--- a/xc/lib/Xaw/TextSink.c
+++ b/xc/lib/Xaw/TextSink.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: TextSink.c,v 1.3 89/09/13 15:06:50 kit Exp $";
+static char Xrcsid[] = "$XConsortium: TextSink.c,v 1.4 89/10/04 13:56:46 kit Exp $";
#endif
/*
@@ -36,6 +36,7 @@ static char Xrcsid[] = "$XConsortium: TextSink.c,v 1.3 89/09/13 15:06:50 kit Exp
#include <ctype.h>
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/TextSinkP.h>
#include <X11/Xaw/TextP.h>
@@ -70,7 +71,7 @@ TextSinkClassRec textSinkClassRec = {
/* superclass */ (WidgetClass) SuperClass,
/* class_name */ "TextSink",
/* widget_size */ sizeof(TextSinkRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ ClassPartInitialize,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/lib/Xaw/TextSrc.c b/xc/lib/Xaw/TextSrc.c
index 773acce21..35e3f3557 100644
--- a/xc/lib/Xaw/TextSrc.c
+++ b/xc/lib/Xaw/TextSrc.c
@@ -1,5 +1,5 @@
#if ( !defined(lint) && !defined(SABER) )
-static char Xrcsid[] = "$XConsortium: TextSrc.c,v 1.1 89/09/01 14:28:35 kit Exp $";
+static char Xrcsid[] = "$XConsortium: TextSrc.c,v 1.2 89/10/04 13:56:04 kit Exp $";
#endif
/*
@@ -36,6 +36,7 @@ static char Xrcsid[] = "$XConsortium: TextSrc.c,v 1.1 89/09/01 14:28:35 kit Exp
#include <ctype.h>
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/TextSrcP.h>
/****************************************************************
@@ -64,7 +65,7 @@ TextSrcClassRec textSrcClassRec = {
/* superclass */ (WidgetClass) SuperClass,
/* class_name */ "TextSrc",
/* widget_size */ sizeof(TextSrcRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ ClassPartInitialize,
/* class_inited */ FALSE,
/* initialize */ NULL,
diff --git a/xc/lib/Xaw/Toggle.c b/xc/lib/Xaw/Toggle.c
index 56f9b21a6..30e317f1a 100644
--- a/xc/lib/Xaw/Toggle.c
+++ b/xc/lib/Xaw/Toggle.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Toggle.c,v 1.9 89/05/11 01:07:00 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Toggle.c,v 1.10 89/10/04 16:51:56 kit Exp $";
#endif /* lint */
/***********************************************************
@@ -42,6 +42,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xmu/Misc.h>
#include <X11/Xaw/ToggleP.h>
@@ -168,6 +169,8 @@ ClassInit()
Cardinal i;
ToggleWidgetClass class = (ToggleWidgetClass) toggleWidgetClass;
+ XawInitializeWidgetSet();
+
/* actions = SuperClass->core_class.actions; */
/* The actions table should really be retrieved from the toggle widget's
diff --git a/xc/lib/Xaw/Vendor.c b/xc/lib/Xaw/Vendor.c
index e77c912a0..083f22b34 100644
--- a/xc/lib/Xaw/Vendor.c
+++ b/xc/lib/Xaw/Vendor.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Vendor.c,v 1.8 89/07/16 14:51:41 jim Exp $";
+static char Xrcsid[] = "$XConsortium: Vendor.c,v 1.9 89/09/07 17:57:33 swick Exp $";
/* $oHeader: Vendor.c,v 1.3 88/08/19 13:11:01 asente Exp $ */
#endif /* lint */
@@ -63,7 +63,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
/* superclass */ (WidgetClass) &wmShellClassRec,
/* class_name */ "VendorShell",
/* size */ sizeof(VendorShellRec),
- /* Class Initializer */ _VendorShellClassInitialize,
+ /* class_initialize */ _VendorShellClassInitialize,
/* class_part_initialize*/ NULL,
/* Class init'ed ? */ FALSE,
/* initialize */ _VendorShellInitialize,
diff --git a/xc/lib/Xaw/Viewport.c b/xc/lib/Xaw/Viewport.c
index e3c9b688d..0d1c8b56b 100644
--- a/xc/lib/Xaw/Viewport.c
+++ b/xc/lib/Xaw/Viewport.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Viewport.c,v 1.43 89/07/21 14:22:46 jim Exp $";
+static char Xrcsid[] = "$XConsortium: Viewport.c,v 1.44 89/08/24 15:27:56 kit Exp $";
#endif /* lint */
@@ -30,6 +30,7 @@ SOFTWARE.
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xmu/Misc.h>
#include <X11/Xaw/Scroll.h>
#include <X11/Xaw/ViewportP.h>
@@ -63,7 +64,7 @@ ViewportClassRec viewportClassRec = {
/* superclass */ (WidgetClass) superclass,
/* class_name */ "Viewport",
/* widget_size */ sizeof(ViewportRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_init */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/programs/xclock/Clock.c b/xc/programs/xclock/Clock.c
index ddc395673..4ac5c1f24 100644
--- a/xc/programs/xclock/Clock.c
+++ b/xc/programs/xclock/Clock.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Clock.c,v 1.46 89/08/23 14:41:08 kit Exp $";
+static char Xrcsid[] = "$XConsortium: Clock.c,v 1.47 89/10/08 15:09:07 rws Exp $";
#endif /* lint */
@@ -31,6 +31,7 @@ SOFTWARE.
#include <X11/Xlib.h>
#include <X11/StringDefs.h>
#include <X11/IntrinsicP.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/ClockP.h>
extern long time();
@@ -145,6 +146,7 @@ WidgetClass clockWidgetClass = (WidgetClass) &clockClassRec;
static void ClassInitialize()
{
+ XawInitializeWidgetSet();
XtAddConverter( XtRString, XtRBackingStore, XmuCvtStringToBackingStore,
NULL, 0 );
}
diff --git a/xc/programs/xlogo/Logo.c b/xc/programs/xlogo/Logo.c
index 5d3bfd684..747610753 100644
--- a/xc/programs/xlogo/Logo.c
+++ b/xc/programs/xlogo/Logo.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char Xrcsid[] = "$XConsortium: Logo.c,v 1.8 88/09/06 16:41:58 jim Exp $";
+static char Xrcsid[] = "$XConsortium: Logo.c,v 1.10 89/05/11 13:35:14 kit Exp $";
#endif
/*
@@ -20,6 +20,7 @@ without express or implied warranty.
#include <X11/StringDefs.h>
#include <X11/IntrinsicP.h>
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/LogoP.h>
static Dimension defDim = 100;
@@ -45,7 +46,7 @@ LogoClassRec logoClassRec = {
/* superclass */ &widgetClassRec,
/* class_name */ "Logo",
/* widget_size */ sizeof(LogoRec),
- /* class_initialize */ NULL,
+ /* class_initialize */ XawInitializeWidgetSet,
/* class_part_initialize */ NULL,
/* class_inited */ FALSE,
/* initialize */ Initialize,
diff --git a/xc/unsupported/programs/xbiff/Mailbox.c b/xc/unsupported/programs/xbiff/Mailbox.c
index d6182e1c2..0f07997ae 100644
--- a/xc/unsupported/programs/xbiff/Mailbox.c
+++ b/xc/unsupported/programs/xbiff/Mailbox.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: Mailbox.c,v 1.32 89/09/07 17:57:09 swick Exp $
+ * $XConsortium: Mailbox.c,v 1.33 89/10/05 17:53:25 jim Exp $
*
* Copyright 1988 Massachusetts Institute of Technology
*
@@ -33,6 +33,7 @@
#include <X11/bitmaps/mailfull> /* for flag up (mail present) bits */
#include <X11/bitmaps/mailempty> /* for flag down (mail not here) */
+#include <X11/Xaw/XawInit.h>
#include <X11/Xaw/MailboxP.h> /* for implementation mailbox stuff */
#include <X11/Xmu/Converters.h> /* for StringToPixmap */
@@ -163,6 +164,7 @@ static void ClassInitialize ()
{ XtWidgetBaseOffset, (caddr_t) XtOffset(Widget, core.screen), sizeof(Screen *) }
};
+ XawInitializeWidgetSet();
XtAddConverter (XtRString, XtRPixmap, XmuCvtStringToPixmap,
screenConvertArg, XtNumber(screenConvertArg));
return;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-20 06:26:59 +0000