Mercurial > hg > xemacs-beta

comparison lwlib/xlwscrollbar.c @ 4528:726060ee587c g++-warning-removal-2008-10-28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First draft of g++ 4.3 warning removal patch. Builds. *Needs ChangeLogs.*
author Stephen J. Turnbull <stephen@xemacs.org>
date Wed, 29 Oct 2008 04:06:33 +0900
parents fc7067b7f407
children ade4c7e2c6cb
comparison
equal deleted inserted replaced
4524:03ba50f7ecd7 4528:726060ee587c
77 #include <X11/IntrinsicP.h> 77 #include <X11/IntrinsicP.h>
78 #include <X11/StringDefs.h> 78 #include <X11/StringDefs.h>
79 #include <X11/bitmaps/gray> 79 #include <X11/bitmaps/gray>
80 80
81 #include "lwlib-colors.h" 81 #include "lwlib-colors.h"
82 #include "xt-wrappers.h"
82 83
83 #include "xlwscrollbarP.h" 84 #include "xlwscrollbarP.h"
84 #include "xlwscrollbar.h" 85 #include "xlwscrollbar.h"
85 86
86 #ifdef USE_DEBUG_MALLOC 87 #ifdef USE_DEBUG_MALLOC
111 SLIDER_PLAIN, 112 SLIDER_PLAIN,
112 SLIDER_DIMPLE 113 SLIDER_DIMPLE
113 } SliderStyle; 114 } SliderStyle;
114 115
115 /*-------------------------- Resources ----------------------------------*/ 116 /*-------------------------- Resources ----------------------------------*/
117
118 static XtResource resources[] = {
116 #define offset(field) XtOffset(XlwScrollBarWidget, field) 119 #define offset(field) XtOffset(XlwScrollBarWidget, field)
117 120 #define res(name,_class,intrepr,type,member,extrepr,value) \
118 static XtResource resources[] = { 121 Xt_RESOURCE (name, _class, intrepr, type, offset(sb.member), extrepr, value)
119 { XmNforeground, XmCForeground, XtRPixel, sizeof(Pixel), 122
120 offset(sb.foreground), XtRImmediate, (XtPointer) XtDefaultForeground }, 123 res (XmNforeground, XmCForeground, XtRPixel, Pixel,
121 124 foreground, XtRImmediate, XtDefaultForeground),
122 { XmNtopShadowColor, XmCTopShadowColor, XtRPixel, 125 res (XmNtopShadowColor, XmCTopShadowColor, XtRPixel,
123 sizeof(Pixel), offset(sb.topShadowColor), XtRImmediate, (XtPointer) ~0 }, 126 Pixel, topShadowColor, XtRImmediate, ~0),
124 { XmNbottomShadowColor, XmCBottomShadowColor, XtRPixel, 127 res (XmNbottomShadowColor, XmCBottomShadowColor, XtRPixel,
125 sizeof(Pixel), offset(sb.bottomShadowColor), XtRImmediate, 128 Pixel, bottomShadowColor, XtRImmediate, ~0),
126 (XtPointer)~0 }, 129
127 130 res (XmNtopShadowPixmap, XmCTopShadowPixmap, XtRPixmap,
128 { XmNtopShadowPixmap, XmCTopShadowPixmap, XtRPixmap, 131 Pixmap, topShadowPixmap, XtRImmediate, None),
129 sizeof (Pixmap), offset(sb.topShadowPixmap), XtRImmediate, 132 res (XmNbottomShadowPixmap, XmCBottomShadowPixmap,
130 (XtPointer)None}, 133 XtRPixmap, Pixmap, bottomShadowPixmap, XtRImmediate, None),
131 { XmNbottomShadowPixmap, XmCBottomShadowPixmap, 134
132 XtRPixmap, sizeof (Pixmap), offset(sb.bottomShadowPixmap), 135 res (XmNtroughColor, XmCTroughColor, XtRPixel, Pixel, troughColor,
133 XtRImmediate, (XtPointer)None}, 136 XtRImmediate, ~0),
134 137
135 { XmNtroughColor, XmCTroughColor, XtRPixel, sizeof(Pixel), 138 res (XmNshadowThickness, XmCShadowThickness, XtRInt, int,
136 offset(sb.troughColor), XtRImmediate, (XtPointer)~0 }, 139 shadowThickness, XtRImmediate, 2),
137 140
138 { XmNshadowThickness, XmCShadowThickness, XtRInt, 141 Xt_RESOURCE (XmNborderWidth, XmCBorderWidth, XtRDimension, Dimension,
139 sizeof(int), offset(sb.shadowThickness), XtRImmediate, (XtPointer)2 }, 142 offset(core.border_width), XtRImmediate, 0),
140 143
141 { XmNborderWidth, XmCBorderWidth, XtRDimension, 144 res (XmNshowArrows, XmCShowArrows, XtRBoolean, Boolean, showArrows,
142 sizeof(Dimension), offset(core.border_width), XtRImmediate, 145 XtRImmediate, True),
143 (XtPointer)0 }, 146
144 147 res (XmNinitialDelay, XmCInitialDelay, XtRInt, int, initialDelay,
145 { XmNshowArrows, XmCShowArrows, XtRBoolean, 148 XtRImmediate, 250),
146 sizeof(Boolean), offset(sb.showArrows), XtRImmediate, (XtPointer)True }, 149 res (XmNrepeatDelay, XmCRepeatDelay, XtRInt, int, repeatDelay,
147 150 XtRImmediate, 50),
148 { XmNinitialDelay, XmCInitialDelay, XtRInt, sizeof(int), 151
149 offset(sb.initialDelay), XtRImmediate, (XtPointer) 250 }, 152 res (XmNorientation, XmCOrientation, XtROrientation,
150 { XmNrepeatDelay, XmCRepeatDelay, XtRInt, sizeof(int), 153 unsigned char, orientation, XtRImmediate, XmVERTICAL),
151 offset(sb.repeatDelay), XtRImmediate, (XtPointer) 50 }, 154
152 155 res (XmNminimum, XmCMinimum, XtRInt, int, minimum, XtRImmediate, 0),
153 { XmNorientation, XmCOrientation, XtROrientation, 156 res (XmNmaximum, XmCMaximum, XtRInt, int, maximum, XtRImmediate, 100),
154 sizeof(unsigned char), offset(sb.orientation), XtRImmediate, 157 res (XmNvalue, XmCValue, XtRInt, int, value, XtRImmediate, 0),
155 (XtPointer) XmVERTICAL }, 158 res (XmNsliderSize, XmCSliderSize, XtRInt, int, sliderSize, XtRImmediate, 10),
156 159 res (XmNincrement, XmCIncrement, XtRInt, int, increment, XtRImmediate, 1),
157 { XmNminimum, XmCMinimum, XtRInt, sizeof(int), 160 res (XmNpageIncrement, XmCPageIncrement, XtRInt, int,
158 offset(sb.minimum), XtRImmediate, (XtPointer) 0}, 161 pageIncrement, XtRImmediate, 10),
159 { XmNmaximum, XmCMaximum, XtRInt, sizeof(int), 162
160 offset(sb.maximum), XtRImmediate, (XtPointer) 100}, 163 res (XmNvalueChangedCallback, XmCValueChangedCallback,
161 { XmNvalue, XmCValue, XtRInt, sizeof(int), 164 XtRCallback, XtPointer, valueChangedCBL, XtRCallback, NULL),
162 offset(sb.value), XtRImmediate, (XtPointer) 0}, 165 res (XmNincrementCallback, XmCIncrementCallback,
163 { XmNsliderSize, XmCSliderSize, XtRInt, sizeof(int), 166 XtRCallback, XtPointer, incrementCBL, XtRCallback, NULL),
164 offset(sb.sliderSize), XtRImmediate, (XtPointer) 10}, 167 res (XmNdecrementCallback, XmCDecrementCallback,
165 { XmNincrement, XmCIncrement, XtRInt, sizeof(int), 168 XtRCallback, XtPointer, decrementCBL, XtRCallback, NULL),
166 offset(sb.increment), XtRImmediate, (XtPointer) 1}, 169 res (XmNpageIncrementCallback, XmCPageIncrementCallback,
167 { XmNpageIncrement, XmCPageIncrement, XtRInt, sizeof(int), 170 XtRCallback, XtPointer, pageIncrementCBL, XtRCallback, NULL),
168 offset(sb.pageIncrement), XtRImmediate, (XtPointer) 10}, 171 res (XmNpageDecrementCallback, XmCPageDecrementCallback,
169 172 XtRCallback, XtPointer, pageDecrementCBL, XtRCallback, NULL),
170 { XmNvalueChangedCallback, XmCValueChangedCallback, 173 res (XmNtoTopCallback, XmCToTopCallback, XtRCallback,
171 XtRCallback, sizeof(XtPointer), offset(sb.valueChangedCBL), 174 XtPointer, toTopCBL, XtRCallback, NULL),
172 XtRCallback, NULL}, 175 res (XmNtoBottomCallback, XmCToBottomCallback, XtRCallback,
173 { XmNincrementCallback, XmCIncrementCallback, 176 XtPointer, toBottomCBL, XtRCallback, NULL),
174 XtRCallback, sizeof(XtPointer), offset(sb.incrementCBL), 177 res (XmNdragCallback, XmCDragCallback, XtRCallback,
175 XtRCallback, NULL}, 178 XtPointer, dragCBL, XtRCallback, NULL),
176 { XmNdecrementCallback, XmCDecrementCallback,
177 XtRCallback, sizeof(XtPointer), offset(sb.decrementCBL),
178 XtRCallback, NULL},
179 { XmNpageIncrementCallback, XmCPageIncrementCallback,
180 XtRCallback, sizeof(XtPointer), offset(sb.pageIncrementCBL),
181 XtRCallback, NULL},
182 { XmNpageDecrementCallback, XmCPageDecrementCallback,
183 XtRCallback, sizeof(XtPointer), offset(sb.pageDecrementCBL),
184 XtRCallback, NULL},
185 { XmNtoTopCallback, XmCToTopCallback, XtRCallback,
186 sizeof(XtPointer), offset(sb.toTopCBL), XtRCallback, NULL},
187 { XmNtoBottomCallback, XmCToBottomCallback, XtRCallback,
188 sizeof(XtPointer), offset(sb.toBottomCBL), XtRCallback, NULL},
189 { XmNdragCallback, XmCDragCallback, XtRCallback,
190 sizeof(XtPointer), offset(sb.dragCBL), XtRCallback, NULL},
191 179
192 /* "knob" is obsolete; use "slider" instead. */ 180 /* "knob" is obsolete; use "slider" instead. */
193 { XmNsliderStyle, XmCSliderStyle, XtRString, sizeof(char *), 181 res (XmNsliderStyle, XmCSliderStyle, XtRString, char *,
194 offset(sb.sliderStyle), XtRImmediate, NULL}, 182 sliderStyle, XtRImmediate, NULL),
195 { XmNknobStyle, XmCKnobStyle, XtRString, sizeof(char *), 183 res (XmNknobStyle, XmCKnobStyle, XtRString, char *,
196 offset(sb.knobStyle), XtRImmediate, NULL}, 184 knobStyle, XtRImmediate, NULL),
197 185
198 { XmNarrowPosition, XmCArrowPosition, XtRString, sizeof(char *), 186 res (XmNarrowPosition, XmCArrowPosition, XtRString, char *,
199 offset(sb.arrowPosition), XtRImmediate, NULL}, 187 arrowPosition, XtRImmediate, NULL),
188 #undef offset
189 #undef res
200 }; 190 };
201 191
202 /*-------------------------- Prototypes ---------------------------------*/ 192 /*-------------------------- Prototypes ---------------------------------*/
203 193
204 /* Actions */ 194 /* Actions */
216 /* Private */ 206 /* Private */
217 207
218 /*-------------------------- Actions Table ------------------------------*/ 208 /*-------------------------- Actions Table ------------------------------*/
219 static XtActionsRec actions[] = 209 static XtActionsRec actions[] =
220 { 210 {
221 {"Select", Select}, 211 { (String) "Select", Select},
222 {"PageDownOrRight", PageDownOrRight}, 212 { (String) "PageDownOrRight", PageDownOrRight},
223 {"PageUpOrLeft", PageUpOrLeft}, 213 { (String) "PageUpOrLeft", PageUpOrLeft},
224 {"Drag", Drag}, 214 { (String) "Drag", Drag},
225 {"Release", Release}, 215 { (String) "Release", Release},
226 {"Jump", Jump}, 216 { (String) "Jump", Jump},
227 {"Abort", Abort}, 217 { (String) "Abort", Abort},
228 }; 218 };
229 219
230 /*--------------------- Default Translation Table -----------------------*/ 220 /*--------------------- Default Translation Table -----------------------*/
231 static char default_translations[] = 221 static char default_translations[] =
232 "<Btn1Down>: Select()\n" 222 "<Btn1Down>: Select()\n"
241 /*------------------- Class record initialization -----------------------*/ 231 /*------------------- Class record initialization -----------------------*/
242 XlwScrollBarClassRec xlwScrollBarClassRec = { 232 XlwScrollBarClassRec xlwScrollBarClassRec = {
243 /* core_class fields */ 233 /* core_class fields */
244 { 234 {
245 /* superclass */ (WidgetClass) &coreClassRec, 235 /* superclass */ (WidgetClass) &coreClassRec,
246 /* class_name */ "XlwScrollBar", 236 /* class_name */ (String) "XlwScrollBar",
247 /* widget_size */ sizeof(XlwScrollBarRec), 237 /* widget_size */ sizeof(XlwScrollBarRec),
248 /* class_initialize */ NULL, 238 /* class_initialize */ NULL,
249 /* class_part_init */ NULL, 239 /* class_part_init */ NULL,
250 /* class_inited */ False, 240 /* class_inited */ False,
251 /* initialize */ Initialize, 241 /* initialize */ Initialize,