Mercurial > hg > xemacs-beta

diff lwlib/xlwscrollbar.c @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children 49a24b4fd526
line wrap: on
line diff
--- a/lwlib/xlwscrollbar.c	Mon Aug 13 08:45:53 2007 +0200
+++ b/lwlib/xlwscrollbar.c	Mon Aug 13 08:46:35 2007 +0200
@@ -116,75 +116,84 @@
 #define offset(field) XtOffset(XlwScrollBarWidget, field)
 
 static XtResource resources[] = {
-    { XmNforeground, XmCForeground, XtRPixel, sizeof(Pixel),
-      offset(sb.foreground), XtRImmediate, XtDefaultForeground },
+    { (String) XmNforeground, (String) XmCForeground, XtRPixel, sizeof(Pixel),
+      offset(sb.foreground), XtRImmediate, (XtPointer) XtDefaultForeground },
+
+    { (String) XmNtopShadowColor, (String) XmCTopShadowColor, XtRPixel,
+      sizeof(Pixel), offset(sb.topShadowColor), XtRImmediate, (XtPointer) ~0 },
+    { (String) XmNbottomShadowColor, (String) XmCBottomShadowColor, XtRPixel,
+      sizeof(Pixel), offset(sb.bottomShadowColor), XtRImmediate,
+      (XtPointer)~0 },
 
-    { XmNtopShadowColor, XmCTopShadowColor, XtRPixel, sizeof(Pixel),
-      offset(sb.topShadowColor), XtRImmediate, (XtPointer) ~0 },
-    { XmNbottomShadowColor, XmCBottomShadowColor, XtRPixel, sizeof(Pixel),
-      offset(sb.bottomShadowColor), XtRImmediate, (XtPointer)~0 },
+    { (String) XmNtopShadowPixmap, (String) XmCTopShadowPixmap, XtRPixmap,
+      sizeof (Pixmap), offset(sb.topShadowPixmap), XtRImmediate,
+      (XtPointer)None},
+    { (String) XmNbottomShadowPixmap, (String) XmCBottomShadowPixmap,
+      XtRPixmap, sizeof (Pixmap), offset(sb.bottomShadowPixmap),
+      XtRImmediate, (XtPointer)None},
 
-    { XmNtopShadowPixmap, XmCTopShadowPixmap, XtRPixmap, sizeof (Pixmap),
-      offset(sb.topShadowPixmap), XtRImmediate, (XtPointer)None},
-    { XmNbottomShadowPixmap, XmCBottomShadowPixmap, XtRPixmap, sizeof (Pixmap),
-      offset(sb.bottomShadowPixmap), XtRImmediate, (XtPointer)None},
-
-    { XmNtroughColor, XmCTroughColor, XtRPixel, sizeof(Pixel),
+    { (String)XmNtroughColor, (String)XmCTroughColor, XtRPixel, sizeof(Pixel),
       offset(sb.troughColor), XtRImmediate, (XtPointer)~0 },
 
-    { XmNshadowThickness, XmCShadowThickness, XtRInt, sizeof(int),
-      offset(sb.shadowThickness), XtRImmediate, (XtPointer)2 },
+    { (String)XmNshadowThickness, (String)XmCShadowThickness, XtRInt,
+      sizeof(int), offset(sb.shadowThickness), XtRImmediate, (XtPointer)2 },
 
-    { XmNborderWidth, XmCBorderWidth, XtRDimension, sizeof(Dimension),
-      offset(core.border_width), XtRImmediate, (XtPointer)0 },
+    { (String) XmNborderWidth, (String) XmCBorderWidth, XtRDimension,
+      sizeof(Dimension), offset(core.border_width), XtRImmediate,
+      (XtPointer)0 },
 
-    { XmNshowArrows, XmCShowArrows, XtRBoolean, sizeof(Boolean),
-      offset(sb.showArrows), XtRImmediate, (XtPointer)True },
+    { (String) XmNshowArrows, (String) XmCShowArrows, XtRBoolean,
+      sizeof(Boolean), offset(sb.showArrows), XtRImmediate, (XtPointer)True },
 
-    { XmNinitialDelay, XmCInitialDelay, XtRInt, sizeof(int),
+    { (String) XmNinitialDelay, (String) XmCInitialDelay, XtRInt, sizeof(int),
       offset(sb.initialDelay), XtRImmediate, (XtPointer) 250 },
-    { XmNrepeatDelay, XmCRepeatDelay, XtRInt, sizeof(int),
+    { (String) XmNrepeatDelay, (String) XmCRepeatDelay, XtRInt, sizeof(int),
       offset(sb.repeatDelay), XtRImmediate, (XtPointer) 50 },
 
-    { XmNorientation, XmCOrientation, XtROrientation, sizeof(unsigned char),
-      offset(sb.orientation), XtRImmediate, (XtPointer) XmVERTICAL },
-
+    { (String) XmNorientation, (String) XmCOrientation, XtROrientation,
+      sizeof(unsigned char), offset(sb.orientation), XtRImmediate,
+      (XtPointer) XmVERTICAL },
 
-    { XmNminimum, XmCMinimum, XtRInt, sizeof(int),
+    { (String) XmNminimum, (String) XmCMinimum, XtRInt, sizeof(int),
       offset(sb.minimum), XtRImmediate, (XtPointer) 0},
-    { XmNmaximum, XmCMaximum, XtRInt, sizeof(int),
+    { (String) XmNmaximum, (String) XmCMaximum, XtRInt, sizeof(int),
       offset(sb.maximum), XtRImmediate, (XtPointer) 100},
-    { XmNvalue, XmCValue, XtRInt, sizeof(int),
+    { (String) XmNvalue, (String) XmCValue, XtRInt, sizeof(int),
       offset(sb.value), XtRImmediate, (XtPointer) 0},
-    { XmNsliderSize, XmCSliderSize, XtRInt, sizeof(int),
+    { (String) XmNsliderSize, (String) XmCSliderSize, XtRInt, sizeof(int),
       offset(sb.sliderSize), XtRImmediate, (XtPointer) 10},
-    { XmNincrement, XmCIncrement, XtRInt, sizeof(int),
+    { (String) XmNincrement, (String) XmCIncrement, XtRInt, sizeof(int),
       offset(sb.increment), XtRImmediate, (XtPointer) 1},
-    { XmNpageIncrement, XmCPageIncrement, XtRInt, sizeof(int),
+    { (String)XmNpageIncrement, (String)XmCPageIncrement, XtRInt, sizeof(int),
       offset(sb.pageIncrement), XtRImmediate, (XtPointer) 10},
 
-    { XmNvalueChangedCallback, XmCValueChangedCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.valueChangedCBL), XtRCallback, NULL},
-    { XmNincrementCallback, XmCIncrementCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.incrementCBL), XtRCallback, NULL},
-    { XmNdecrementCallback, XmCDecrementCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.decrementCBL), XtRCallback, NULL},
-    { XmNpageIncrementCallback, XmCPageIncrementCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.pageIncrementCBL), XtRCallback, NULL},
-    { XmNpageDecrementCallback, XmCPageDecrementCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.pageDecrementCBL), XtRCallback, NULL},
-    { XmNtoTopCallback, XmCToTopCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.toTopCBL), XtRCallback, NULL},
-    { XmNtoBottomCallback, XmCToBottomCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.toBottomCBL), XtRCallback, NULL},
-    { XmNdragCallback, XmCDragCallback, XtRCallback, sizeof(XtPointer),
-      offset(sb.dragCBL), XtRCallback, NULL},
+    { (String) XmNvalueChangedCallback, (String) XmCValueChangedCallback,
+      XtRCallback, sizeof(XtPointer), offset(sb.valueChangedCBL),
+      XtRCallback, NULL},
+    { (String) XmNincrementCallback, (String) XmCIncrementCallback,
+      XtRCallback, sizeof(XtPointer), offset(sb.incrementCBL),
+      XtRCallback, NULL},
+    { (String) XmNdecrementCallback, (String) XmCDecrementCallback,
+      XtRCallback, sizeof(XtPointer), offset(sb.decrementCBL),
+      XtRCallback, NULL},
+    { (String) XmNpageIncrementCallback, (String) XmCPageIncrementCallback,
+      XtRCallback, sizeof(XtPointer), offset(sb.pageIncrementCBL),
+      XtRCallback, NULL},
+    { (String) XmNpageDecrementCallback, (String) XmCPageDecrementCallback,
+      XtRCallback, sizeof(XtPointer), offset(sb.pageDecrementCBL),
+      XtRCallback, NULL},
+    { (String) XmNtoTopCallback, (String) XmCToTopCallback, XtRCallback,
+      sizeof(XtPointer), offset(sb.toTopCBL), XtRCallback, NULL},
+    { (String) XmNtoBottomCallback, (String) XmCToBottomCallback, XtRCallback,
+      sizeof(XtPointer), offset(sb.toBottomCBL), XtRCallback, NULL},
+    { (String) XmNdragCallback, (String) XmCDragCallback, XtRCallback,
+      sizeof(XtPointer), offset(sb.dragCBL), XtRCallback, NULL},
 
-    { XmNknobStyle, XmCKnobStyle, XtRString, sizeof(char *),
+    { (String) XmNknobStyle, (String) XmCKnobStyle, XtRString, sizeof(char *),
       offset(sb.knobStyle), XtRImmediate, NULL},
 
-    { XmNarrowPosition, XmCArrowPosition, XtRString, sizeof(char *),
-      offset(sb.arrowPosition), XtRImmediate, NULL},
+    { (String) XmNarrowPosition, (String) XmCArrowPosition, XtRString,
+      sizeof(char *), offset(sb.arrowPosition), XtRImmediate, NULL},
 };
 
 /************************************************************************
@@ -225,13 +234,13 @@
 **
 */
 static XtActionsRec actions[] = {
-    {"Select",     		Select},
-    {"PageDownOrRight",     PageDownOrRight},
-    {"PageUpOrLeft",	    	PageUpOrLeft},
-    {"Drag",			Drag},
-    {"Release",		Release},
-    {"Jump",			Jump},
-    {"Abort",			Abort},
+    {(String) "Select",     		Select},
+    {(String) "PageDownOrRight",	PageDownOrRight},
+    {(String) "PageUpOrLeft",	    	PageUpOrLeft},
+    {(String) "Drag",			Drag},
+    {(String) "Release",		Release},
+    {(String) "Jump",			Jump},
+    {(String) "Abort",			Abort},
 };
 
 /************************************************************************
@@ -258,7 +267,7 @@
     /* core_class fields */
     {
     /* superclass          */ (WidgetClass) &coreClassRec,
-    /* class_name          */ "XlwScrollBar",
+    /* class_name          */ (String) "XlwScrollBar",
     /* widget_size         */ sizeof(XlwScrollBarRec),
     /* class_initialize    */ NULL,
     /* class_part_init     */ NULL,