~ubuntu-branches/ubuntu/utopic/tcm/utopic : revision 4

1

#! /bin/sh /usr/share/dpatch/dpatch-run

2

## 30_amd64_null.dpatch by Adrian Knoth <adi@drcomp.erfurt.thur.de>

3

##

4

## All lines beginning with `## DP:' are a description of the patch.

5

## DP: No description.

6

7

@DPATCH@

8

diff -Nur tcm-2.20+TSQD.orig/src/dg/diagramstubs.c tcm-2.20+TSQD/src/dg/diagramstubs.c

9

--- tcm-2.20+TSQD.orig/src/dg/diagramstubs.c 2004-07-21 19:47:43.000000000 +0200

10

+++ tcm-2.20+TSQD/src/dg/diagramstubs.c 2006-04-02 15:13:09.000000000 +0200

11

@@ -35,7 +35,7 @@

12

// 'unset' event of a toggle button should be discarded.

13

if (XmToggleButtonGetState(w)) {

14

int num;

15

- XtVaGetValues(w, XmNuserData, &num, 0);

16

+ XtVaGetValues(w, XmNuserData, &num, NULL);

17

((Diagram *)cd)->UpdateNodeType((int)num);

18

}

19

}

20

@@ -44,7 +44,7 @@

21

// 'unset' event of a toggle button should be discarded.

22

if (XmToggleButtonGetState(w)) {

23

int num;

24

- XtVaGetValues(w, XmNuserData, &num, 0);

25

+ XtVaGetValues(w, XmNuserData, &num, NULL);

26

((Diagram *)cd)->UpdateEdgeType((int)num);

27

}

28

}

29

@@ -131,7 +131,7 @@

30

void DiagramStubs::DefaultNodeLineStyleCB(Widget w, XtPointer cd, XtPointer) {

31

if (XmToggleButtonGetState(w)) {

32

int n;

33

- XtVaGetValues(w, XmNuserData, &n, 0);

34

+ XtVaGetValues(w, XmNuserData, &n, NULL);

35

n = n/2;

36

LineStyle::Type i = LineStyle::SOLID;

37

if (n == 1)

38

@@ -147,7 +147,7 @@

39

void DiagramStubs::DefaultEdgeLineStyleCB(Widget w, XtPointer cd, XtPointer) {

40

if (XmToggleButtonGetState(w)) {

41

int n;

42

- XtVaGetValues(w, XmNuserData, &n, 0);

43

+ XtVaGetValues(w, XmNuserData, &n, NULL);

44

n = n/2;

45

LineStyle::Type i = LineStyle::SOLID;

46

if (n == 1)

47

@@ -170,7 +170,7 @@

48

49

void DiagramStubs::UpdateNodeShapeTypeCB(Widget w, XtPointer cd, XtPointer) {

50

int num;

51

- XtVaGetValues(w, XmNuserData, &num, 0);

52

+ XtVaGetValues(w, XmNuserData, &num, NULL);

53

((DiagramViewer *)cd)->UpdateNodeShapeType(num);

54

}

55

56

diff -Nur tcm-2.20+TSQD.orig/src/dg/diagramwindow.c tcm-2.20+TSQD/src/dg/diagramwindow.c

57

--- tcm-2.20+TSQD.orig/src/dg/diagramwindow.c 2004-07-21 19:46:02.000000000 +0200

58

+++ tcm-2.20+TSQD/src/dg/diagramwindow.c 2006-04-02 15:13:09.000000000 +0200

59

@@ -135,15 +135,15 @@

60

SetScaleValue(CreateScaleValue(parent));

61

XtVaSetValues(GetStatusArea(),

62

XmNleftAttachment, XmATTACH_OPPOSITE_WIDGET,

63

- XmNleftWidget, GetScrolledWindow(), 0);

64

+ XmNleftWidget, GetScrolledWindow(), NULL);

65

XtVaSetValues(GetScrolledWindow(),

66

XmNleftAttachment, XmATTACH_WIDGET,

67

XmNleftWidget, tiles,

68

XmNbottomAttachment, XmATTACH_WIDGET,

69

- XmNbottomWidget, GetArrowButtons(), 0);

70

+ XmNbottomWidget, GetArrowButtons(), NULL);

71

// XtVaSetValues(tiles,

72

// XmNbottomAttachment, XmATTACH_WIDGET,

73

- // XmNbottomWidget, GetArrowButtons(), 0);

74

+ // XmNbottomWidget, GetArrowButtons(), NULL);

75

}

76

77

Widget DiagramWindow::CreateTiles(Widget parent) {

78

@@ -157,7 +157,7 @@

79

XmNtopWidget, GetDocumentArea(),

80

XmNleftAttachment, XmATTACH_FORM,

81

XmNadjustLast, True,

82

- 0);

83

+ NULL);

84

CalcIconColumns();

85

CreateNodeIcons(t);

86

CreateEdgeIcons(t);

87

@@ -202,12 +202,12 @@

88

// create a frame: for nodes

89

Widget frame = XtVaCreateWidget("TilesFrame1",

90

xmFrameWidgetClass, t,

91

- XmNshadowType, XmSHADOW_ETCHED_IN, 0);

92

+ XmNshadowType, XmSHADOW_ETCHED_IN, NULL);

93

94

// create a rowcolumn for nodes

95

nodeIconsRC = XtVaCreateWidget("NodeIconsRC", xmRowColumnWidgetClass,

96

frame, XmNentryAlignment,

97

- XmALIGNMENT_CENTER, 0);

98

+ XmALIGNMENT_CENTER, NULL);

99

100

// make scrollbars when there are many icons.

101

if (iconColumns > 2) {

102

@@ -220,16 +220,16 @@

103

XmNheight,

104

GetIconsScrollHeight((nrNodes-1)/iconColumns + 1),

105

XmNscrollingPolicy, XmAUTOMATIC,

106

- XmNscrollBarDisplayPolicy, XmAS_NEEDED, 0);

107

+ XmNscrollBarDisplayPolicy, XmAS_NEEDED, NULL);

108

109

Widget clipWindow;

110

- XtVaGetValues(scrolledWin, XmNclipWindow, &clipWindow, 0);

111

- XtVaSetValues(clipWindow, XmNborderWidth, 0, 0);

112

+ XtVaGetValues(scrolledWin, XmNclipWindow, &clipWindow, NULL);

113

+ XtVaSetValues(clipWindow, XmNborderWidth, NULL, NULL);

114

}

115

116

XtVaCreateManagedWidget("nodes",

117

xmLabelWidgetClass, frame,

118

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

119

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

120

XtSetArg(args[i], XmNradioAlwaysOne, True); i++;

121

XtSetArg(args[i], XmNnumColumns, iconColumns); i++;

122

XtSetArg(args[i], XmNadjustLast, False); i++;

123

@@ -246,7 +246,7 @@

124

// the first button is set by default

125

XmNset, i == 0? True: False,

126

XmNhighlightThickness, 0,

127

- XmNalignment, XmALIGNMENT_CENTER, 0);

128

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

129

pixmap = nodeIcons[i].CreatePixmap(pb, GetDisplay());

130

XtVaSetValues(pb,

131

XmNlabelType, XmPIXMAP,

132

@@ -254,7 +254,7 @@

133

XmNuserData, (XtPointer)(i+1),

134

// determines widget for which the

135

// callback is involved.

136

- 0);

137

+ NULL);

138

XtAddCallback(pb, XmNvalueChangedCallback,

139

DiagramStubs::SetNodeCB, (XtPointer)GetDocument());

140

AddLiteClue(pb, (char *)nodeNames[i]);

141

@@ -275,15 +275,15 @@

142

// create a frame: for edges

143

Widget frame = XtVaCreateWidget("TilesFrame2",

144

xmFrameWidgetClass, t,

145

- XmNshadowType, XmSHADOW_ETCHED_IN, 0);

146

+ XmNshadowType, XmSHADOW_ETCHED_IN, NULL);

147

// create a rowcolumn of edges

148

edgeIconsRC = XtVaCreateWidget("EdgeIconsRC", xmRowColumnWidgetClass,

149

frame, XmNentryAlignment, XmALIGNMENT_CENTER,

150

- 0);

151

+ NULL);

152

// create a label for edges

153

XtVaCreateManagedWidget("edges",

154

xmLabelWidgetClass, frame,

155

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

156

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

157

158

XtSetArg(args[i], XmNradioAlwaysOne, True); i++;

159

XtSetArg(args[i], XmNnumColumns, iconColumns); i++;

160

@@ -298,13 +298,13 @@

161

xmToggleButtonWidgetClass, rb,

162

XmNset, i == 0? True: False,

163

XmNhighlightThickness, 0,

164

- XmNalignment, XmALIGNMENT_CENTER, 0);

165

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

166

pixmap = edgeIcons[i].CreatePixmap(pb, GetDisplay());

167

XtVaSetValues(pb,

168

XmNlabelType, XmPIXMAP,

169

XmNlabelPixmap, pixmap,

170

XmNuserData, (XtPointer)(i+1),

171

- 0);

172

+ NULL);

173

XtAddCallback(pb, XmNvalueChangedCallback,

174

DiagramStubs::SetEdgeCB, (XtPointer)GetDocument());

175

AddLiteClue(pb, (char *)edgeNames[i]);

176

@@ -318,7 +318,7 @@

177

// create a button for the curve toggle

178

pb = XtVaCreateWidget("create curve", xmToggleButtonWidgetClass, rb,

179

XmNhighlightThickness, 0,

180

- XmNalignment, XmALIGNMENT_CENTER, 0);

181

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

182

XtAddCallback(pb, XmNvalueChangedCallback,

183

DiagramStubs::SetCurveCB, (XtPointer)GetDocument());

184

AddLiteClue(pb, "When on, curved edges are created");

185

@@ -333,7 +333,7 @@

186

void DiagramWindow::CreateLineStyleOptionMenu(Widget w, bool nodes,

187

bool minimize) {

188

Widget frame1 = XtVaCreateManagedWidget("LineStyleFrame",

189

- xmFrameWidgetClass, w, 0);

190

+ xmFrameWidgetClass, w, NULL);

191

Menu *menu;

192

string label;

193

194

@@ -348,7 +348,7 @@

195

label = "line style";

196

XtVaCreateManagedWidget(label.getstr(),

197

xmLabelWidgetClass, frame1,

198

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

199

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

200

}

201

}

202

else { // edges

203

@@ -362,7 +362,7 @@

204

label = "line style";

205

XtVaCreateManagedWidget(label.getstr(),

206

xmLabelWidgetClass, frame1,

207

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

208

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

209

}

210

}

211

XtManageChild(menu->GetWidget());

212

@@ -399,7 +399,7 @@

213

documentItems);

214

helpMenu = new Menu(bar, Menu::PULLDOWN, "Help", 0, helpItems);

215

// tell bar which bar which button is the help menu

216

- XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), 0);

217

+ XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), NULL);

218

// Bar is done -- manage it

219

XtManageChild(bar);

220

return bar;

221

@@ -760,7 +760,7 @@

222

xmToggleButtonWidgetClass, rb,

223

XmNhighlightThickness, 0,

224

XmNset, viewer->IsShowIndexes(),

225

- XmNalignment, XmALIGNMENT_CENTER, 0);

226

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

227

XtAddCallback(pb, XmNvalueChangedCallback,

228

DiagramStubs::ShowIndexesCB, (XtPointer)viewer);

229

AddLiteClue(pb, "When on, new nodes get an index");

230

@@ -795,6 +795,6 @@

231

DrawWindow::SetHierarchic(s);

232

Widget w1 = editMenu->GetMenuItem("Duplicate");

233

if ( w1 )

234

- XtVaSetValues(w1, XmNsensitive, ! s, 0);

235

+ XtVaSetValues(w1, XmNsensitive, ! s, NULL);

236

GetDrawingArea()->Enable("Duplicate", ! s);

237

}

238

diff -Nur tcm-2.20+TSQD.orig/src/ed/drawingarea.c tcm-2.20+TSQD/src/ed/drawingarea.c

239

--- tcm-2.20+TSQD.orig/src/ed/drawingarea.c 2004-07-21 19:51:35.000000000 +0200

240

+++ tcm-2.20+TSQD/src/ed/drawingarea.c 2006-04-02 15:13:09.000000000 +0200

241

@@ -75,11 +75,11 @@

242

XmNheight, height,

243

XmNwidth, width,

244

XmNresizePolicy, XmNONE, // remain this a fixed size

245

- 0));

246

+ NULL));

247

// set up destruction handler.

248

InstallDestroyHandler();

249

// convert drawing area back to pixels to get its width and height

250

- XtVaSetValues(GetWidget(), XmNunitType, XmPIXELS, 0);

251

+ XtVaSetValues(GetWidget(), XmNunitType, XmPIXELS, NULL);

252

XtAddCallback(GetWidget(), XmNexposeCallback, DrawCB, this);

253

XtAddCallback(GetWidget(), XmNresizeCallback, DrawCB, this);

254

XtAddCallback(GetWidget(), XmNinputCallback, DrawCB, this);

255

@@ -107,13 +107,13 @@

256

257

Pixel DrawingArea::GetBackgroundColor() {

258

Pixel p;

259

- XtVaGetValues(GetWidget(), XmNbackground, &p, 0);

260

+ XtVaGetValues(GetWidget(), XmNbackground, &p, NULL);

261

return p;

262

}

263

264

Pixel DrawingArea::GetForegroundColor() {

265

Pixel p;

266

- XtVaGetValues(GetWidget(), XmNforeground, &p, 0);

267

+ XtVaGetValues(GetWidget(), XmNforeground, &p, NULL);

268

return p;

269

}

270

271

@@ -162,7 +162,7 @@

272

// // make "Duplicate" command insensitive.

273

// Widget w1 = popupMenu->GetMenuItem("Duplicate");

274

// if (w1)

275

-// XtVaSetValues(w1, XmNsensitive, False, 0);

276

+// XtVaSetValues(w1, XmNsensitive, False, NULL);

277

// }

278

}

279

280

@@ -374,26 +374,26 @@

281

void DrawingArea::EnableUndo(bool flag) {

282

Widget undoMenuItem = popupMenu->GetMenuItem("Undo");

283

if (undoMenuItem)

284

- XtVaSetValues(undoMenuItem, XmNsensitive, flag, 0);

285

+ XtVaSetValues(undoMenuItem, XmNsensitive, flag, NULL);

286

}

287

288

void DrawingArea::EnableRedo(bool flag) {

289

Widget redoMenuItem = popupMenu->GetMenuItem("Redo");

290

if (redoMenuItem)

291

- XtVaSetValues(redoMenuItem, XmNsensitive, flag, 0);

292

+ XtVaSetValues(redoMenuItem, XmNsensitive, flag, NULL);

293

}

294

295

void DrawingArea::Enable(const char *label, bool flag) {

296

Widget menuItem = popupMenu->GetMenuItem(label);

297

if (menuItem)

298

- XtVaSetValues(menuItem, XmNsensitive, flag, 0);

299

+ XtVaSetValues(menuItem, XmNsensitive, flag, NULL);

300

}

301

302

void DrawingArea::SetUndoName(const char *undoname) {

303

XmString s = CreateXmString(undoname);

304

Widget undoMenuItem = popupMenu->GetMenuItem("Undo");

305

if (undoMenuItem)

306

- XtVaSetValues(undoMenuItem, XmNlabelString, s, 0);

307

+ XtVaSetValues(undoMenuItem, XmNlabelString, s, NULL);

308

XmStringFree(s);

309

}

310

311

@@ -401,7 +401,7 @@

312

XmString s = CreateXmString(redoname);

313

Widget redoMenuItem = popupMenu->GetMenuItem("Redo");

314

if (redoMenuItem)

315

- XtVaSetValues(redoMenuItem, XmNlabelString, s, 0);

316

+ XtVaSetValues(redoMenuItem, XmNlabelString, s, NULL);

317

XmStringFree(s);

318

}

319

320

diff -Nur tcm-2.20+TSQD.orig/src/ed/drawwindow.c tcm-2.20+TSQD/src/ed/drawwindow.c

321

--- tcm-2.20+TSQD.orig/src/ed/drawwindow.c 2004-07-21 19:51:36.000000000 +0200

322

+++ tcm-2.20+TSQD/src/ed/drawwindow.c 2006-04-02 15:13:09.000000000 +0200

323

@@ -118,28 +118,28 @@

324

XmNwidth, scrollWidth,

325

XmNscrollingPolicy, XmAUTOMATIC,

326

XmNscrollBarDisplayPolicy, XmAS_NEEDED,

327

- XmNrightAttachment, XmATTACH_FORM, 0);

328

+ XmNrightAttachment, XmATTACH_FORM, NULL);

329

if (GetDocumentArea())

330

XtVaSetValues(sw,

331

XmNtopAttachment, XmATTACH_WIDGET,

332

- XmNtopWidget, GetDocumentArea(), 0);

333

+ XmNtopWidget, GetDocumentArea(), NULL);

334

if (GetLogo())

335

XtVaSetValues(sw,

336

XmNtopAttachment, XmATTACH_WIDGET,

337

- XmNtopWidget, GetLogo(), 0);

338

+ XmNtopWidget, GetLogo(), NULL);

339

if (GetStatusArea())

340

XtVaSetValues(GetStatusArea(),

341

XmNtopAttachment, XmATTACH_WIDGET,

342

- XmNtopWidget, sw, 0);

343

+ XmNtopWidget, sw, NULL);

344

else if (GetControlArea())

345

XtVaSetValues(sw,

346

XmNbottomAttachment, XmATTACH_WIDGET,

347

- XmNbottomWidget, GetControlArea(), 0);

348

+ XmNbottomWidget, GetControlArea(), NULL);

349

else

350

XtVaSetValues(sw,

351

- XmNbottomAttachment, XmATTACH_FORM, 0);

352

- XtVaGetValues(sw, XmNverticalScrollBar, &verticalScrollBar, 0);

353

- XtVaGetValues(sw, XmNhorizontalScrollBar, &horizontalScrollBar, 0);

354

+ XmNbottomAttachment, XmATTACH_FORM, NULL);

355

+ XtVaGetValues(sw, XmNverticalScrollBar, &verticalScrollBar, NULL);

356

+ XtVaGetValues(sw, XmNhorizontalScrollBar, &horizontalScrollBar, NULL);

357

return sw;

358

}

359

360

@@ -156,14 +156,14 @@

361

XmNminimum, &vminimum,

362

XmNpageIncrement, &vpage_incr,

363

XmNsliderSize, &vslider_size,

364

- XmNvalue, &vvalue, 0);

365

+ XmNvalue, &vvalue, NULL);

366

XtVaGetValues(horizontalScrollBar,

367

XmNincrement, &hincrement,

368

XmNmaximum, &hmaximum,

369

XmNminimum, &hminimum,

370

XmNpageIncrement, &hpage_incr,

371

XmNsliderSize, &hslider_size,

372

- XmNvalue, &hvalue, 0);

373

+ XmNvalue, &hvalue, NULL);

374

hvalue = min(hmaximum-hslider_size, max(0, (x - hslider_size/2)));

375

XmScrollBarSetValues(horizontalScrollBar, hvalue, hslider_size,

376

hincrement, hpage_incr, True);

377

@@ -182,7 +182,7 @@

378

// XmNminimum, &minimum,

379

// XmNpageIncrement, &page_incr,

380

// XmNsliderSize, &slider_size,

381

-// XmNvalue, &value, 0);

382

+// XmNvalue, &value, NULL);

383

//}

384

//

385

386

@@ -193,7 +193,7 @@

387

xmLabelWidgetClass, parent,

388

XmNtopAttachment, XmATTACH_WIDGET,

389

XmNtopWidget, scrolledWindow,

390

- XmNrightAttachment, XmATTACH_FORM, 0);

391

+ XmNrightAttachment, XmATTACH_FORM, NULL);

392

// XtAddCallback(z, XmNactivateCallback, get_sb, verticalScrollBar);

393

AddLiteClue(z,

394

"Current scale percentage (Alt+L = larger, Alt+S = smaller)");

395

@@ -205,7 +205,7 @@

396

string text = "Scale: ";

397

text += s;

398

XmString label = CreateXmString(text.getstr());

399

- XtVaSetValues(scaleValue, XmNlabelString, label, 0);

400

+ XtVaSetValues(scaleValue, XmNlabelString, label, NULL);

401

XmStringFree(label);

402

}

403

}

404

@@ -217,7 +217,7 @@

405

if (arrowButtons)

406

XtVaSetValues(rc, XmNleftAttachment, XmATTACH_WIDGET,

407

XmNleftOffset, 20,

408

- XmNleftWidget, arrowButtons, 0);

409

+ XmNleftWidget, arrowButtons, NULL);

410

autoResizeToggle = CreateToggle(rc, "autoresizing",

411

GetConfig()->GetAutoResizing(),

412

EditStubs::SetAutoResizeCB,

413

@@ -241,20 +241,20 @@

414

hierarchicToggle = 0;

415

XtVaCreateManagedWidget(" Directory: ",

416

xmLabelWidgetClass, rc,

417

- XmNalignment, XmALIGNMENT_BEGINNING, 0);

418

+ XmNalignment, XmALIGNMENT_BEGINNING, NULL);

419

Widget dn = XtVaCreateManagedWidget("DirectoryName",

420

xmTextFieldWidgetClass, rc,

421

XmNeditable, True,

422

- XmNcursorPositionVisible, True, 0);

423

+ XmNcursorPositionVisible, True, NULL);

424

SetDirName(dn);

425

AddLiteClue(dn, "Current project directory. Can be changed "

426

"(apply with <enter>)");

427

if (GetScreenType() <= SVGA)

428

- XtVaSetValues(dn, XmNcolumns, 28, 0);

429

+ XtVaSetValues(dn, XmNcolumns, 28, NULL);

430

else if (GetScreenType() == XVGA)

431

- XtVaSetValues(dn, XmNcolumns, 34, 0);

432

+ XtVaSetValues(dn, XmNcolumns, 34, NULL);

433

else

434

- XtVaSetValues(dn, XmNcolumns, 40, 0);

435

+ XtVaSetValues(dn, XmNcolumns, 40, NULL);

436

XtAddCallback(dn, XmNactivateCallback,

437

EditStubs::ChangeDirCB, (XtPointer)GetDocument());

438

XtManageChild(rc);

439

@@ -265,10 +265,10 @@

440

Widget frame = XtVaCreateManagedWidget("ArrowsFrame",

441

xmFrameWidgetClass, parent,

442

XmNbottomAttachment, XmATTACH_FORM,

443

- XmNleftAttachment, XmATTACH_FORM, 0);

444

+ XmNleftAttachment, XmATTACH_FORM, NULL);

445

Widget form = XtVaCreateManagedWidget("ArrowsForm",

446

xmFormWidgetClass, frame,

447

- XmNfractionBase, 3, 0);

448

+ XmNfractionBase, 3, NULL);

449

Widget a1 = XtVaCreateManagedWidget(

450

"arrow1", xmArrowButtonWidgetClass, form,

451

XmNtopPosition, 0,

452

@@ -280,7 +280,7 @@

453

XmNrightAttachment, XmATTACH_POSITION,

454

XmNleftAttachment, XmATTACH_POSITION,

455

XmNarrowDirection, XmARROW_UP,

456

- XmNuserData, Document::UP, 0);

457

+ XmNuserData, Document::UP, NULL);

458

Widget a2 = XtVaCreateManagedWidget(

459

"arrow2", xmArrowButtonWidgetClass, form,

460

XmNtopPosition, 1,

461

@@ -292,7 +292,7 @@

462

XmNrightAttachment, XmATTACH_POSITION,

463

XmNleftAttachment, XmATTACH_POSITION,

464

XmNarrowDirection, XmARROW_LEFT,

465

- XmNuserData, (XtPointer)Document::LEFT, 0);

466

+ XmNuserData, (XtPointer)Document::LEFT, NULL);

467

Widget a3 = XtVaCreateManagedWidget(

468

"arrow3", xmArrowButtonWidgetClass, form,

469

XmNtopPosition, 1,

470

@@ -304,7 +304,7 @@

471

XmNrightAttachment, XmATTACH_POSITION,

472

XmNleftAttachment, XmATTACH_POSITION,

473

XmNarrowDirection, XmARROW_RIGHT,

474

- XmNuserData, (XtPointer)Document::RIGHT, 0);

475

+ XmNuserData, (XtPointer)Document::RIGHT, NULL);

476

Widget a4 = XtVaCreateManagedWidget(

477

"arrow4", xmArrowButtonWidgetClass, form,

478

XmNtopPosition, 2,

479

@@ -316,7 +316,7 @@

480

XmNrightAttachment, XmATTACH_POSITION,

481

XmNleftAttachment, XmATTACH_POSITION,

482

XmNarrowDirection, XmARROW_DOWN,

483

- XmNuserData, (XtPointer)Document::DOWN, 0);

484

+ XmNuserData, (XtPointer)Document::DOWN, NULL);

485

XmString c = CreateXmString("C");

486

Widget a5 = XtVaCreateManagedWidget(

487

"arrow5", xmPushButtonWidgetClass, form,

488

@@ -329,7 +329,7 @@

489

XmNbottomAttachment, XmATTACH_POSITION,

490

XmNrightAttachment, XmATTACH_POSITION,

491

XmNleftAttachment, XmATTACH_POSITION,

492

- XmNuserData, (XtPointer)Document::CENTER, 0);

493

+ XmNuserData, (XtPointer)Document::CENTER, NULL);

494

XmStringFree(c);

495

AddLiteClue(a1, "Move the document one step up");

496

AddLiteClue(a2, "Move the document one step left");

497

@@ -415,18 +415,18 @@

498

499

void DrawWindow::SetAutoResize(bool set) {

500

if (autoResizeToggle)

501

- XtVaSetValues(autoResizeToggle, XmNset, set, 0);

502

+ XtVaSetValues(autoResizeToggle, XmNset, set, NULL);

503

}

504

505

void DrawWindow::SetInlineEdit(bool set) {

506

if (inlineEditToggle)

507

- XtVaSetValues(inlineEditToggle, XmNset, set, 0);

508

+ XtVaSetValues(inlineEditToggle, XmNset, set, NULL);

509

}

510

511

512

/* virtual */ void DrawWindow::SetHierarchic(bool set) {

513

if ( hierarchicToggle )

514

- XtVaSetValues(hierarchicToggle, XmNset, set, 0);

515

+ XtVaSetValues(hierarchicToggle, XmNset, set, NULL);

516

}

517

518

519

@@ -771,5 +771,5 @@

520

return;

521

Widget docMenuItem = documentMenu->GetMenuItem("Document Source...");

522

if (docMenuItem)

523

- XtVaSetValues(docMenuItem, XmNsensitive, flag, 0);

524

+ XtVaSetValues(docMenuItem, XmNsensitive, flag, NULL);

525

}

526

diff -Nur tcm-2.20+TSQD.orig/src/ed/editstubs.c tcm-2.20+TSQD/src/ed/editstubs.c

527

--- tcm-2.20+TSQD.orig/src/ed/editstubs.c 2004-07-21 19:51:38.000000000 +0200

528

+++ tcm-2.20+TSQD/src/ed/editstubs.c 2006-04-02 15:13:09.000000000 +0200

529

@@ -41,7 +41,7 @@

530

531

void EditStubs::HelpCB(Widget w, XtPointer cd, XtPointer) {

532

Helper::HelpTopicType tp;

533

- XtVaGetValues(w, XmNuserData, &tp, 0);

534

+ XtVaGetValues(w, XmNuserData, &tp, NULL);

535

((Helper *)cd)->Help(tp);

536

}

537

538

@@ -207,7 +207,7 @@

539

540

void EditStubs::MoveCB(Widget w, XtPointer cd, XtPointer) {

541

int num;

542

- XtVaGetValues(w, XmNuserData, &num, 0);

543

+ XtVaGetValues(w, XmNuserData, &num, NULL);

544

((Document *)cd)->Move((Document::MoveType)num);

545

}

546

547

@@ -351,7 +351,7 @@

548

void EditStubs::PageOrientationCB(Widget w, XtPointer cd, XtPointer) {

549

if (XmToggleButtonGetState(w)) {

550

int num;

551

- XtVaGetValues(w, XmNuserData, &num, 0);

552

+ XtVaGetValues(w, XmNuserData, &num, NULL);

553

((Printer *)cd)->SetPageOrientation(num/2);

554

}

555

}

556

@@ -359,7 +359,7 @@

557

void EditStubs::ShowDocumentInfoCB(Widget w, XtPointer cd, XtPointer) {

558

if (XmToggleButtonGetState(w)) {

559

int num;

560

- XtVaGetValues(w, XmNuserData, &num, 0);

561

+ XtVaGetValues(w, XmNuserData, &num, NULL);

562

((Printer *)cd)->ShowInfo(num/2);

563

}

564

}

565

@@ -423,7 +423,7 @@

566

void EditStubs::BannerPageCB(Widget w, XtPointer cd, XtPointer) {

567

if (XmToggleButtonGetState(w)) {

568

int num;

569

- XtVaGetValues(w, XmNuserData, &num, 0);

570

+ XtVaGetValues(w, XmNuserData, &num, NULL);

571

((Printer *)cd)->SetBannerPage(num/2);

572

}

573

}

574

@@ -434,7 +434,7 @@

575

// it corresponds

576

XmString xms;

577

xms = CreateXmString("");

578

- XtVaGetValues(w, XmNlabelString, &xms, 0);

579

+ XtVaGetValues(w, XmNlabelString, &xms, NULL);

580

char *txt;

581

if (XmStringGetLtoR(xms, XmFONTLIST_DEFAULT_TAG, &txt)) {

582

string s = txt;

583

diff -Nur tcm-2.20+TSQD.orig/src/ed/editwindow.c tcm-2.20+TSQD/src/ed/editwindow.c

584

--- tcm-2.20+TSQD.orig/src/ed/editwindow.c 2004-07-21 19:51:37.000000000 +0200

585

+++ tcm-2.20+TSQD/src/ed/editwindow.c 2006-04-02 15:13:09.000000000 +0200

586

@@ -125,7 +125,7 @@

587

logoBitmap.xbm_bits = (unsigned char *)Teapot2a_bits;

588

logoPixmap = logoBitmap.CreatePixmap(parent, GetDisplay());

589

Widget form = XtVaCreateManagedWidget(GetName()->getstr(),

590

- xmFormWidgetClass, parent, 0);

591

+ xmFormWidgetClass, parent, NULL);

592

// find type of document tool

593

int tool = GetTool();

594

// parse command line options

595

@@ -275,7 +275,7 @@

596

Pixel fg, bg;

597

// get the foreground and background colors of the parent

598

// to make the pixmaps appear using a consistent color

599

- XtVaGetValues(parent, XmNforeground, &fg, XmNbackground, &bg, 0);

600

+ XtVaGetValues(parent, XmNforeground, &fg, XmNbackground, &bg, NULL);

601

// the pixmap is loaded from a X11 bitmap, called DEFAULT_ICON.

602

Pixmap px = logoBitmap.CreatePixmap(parent, GetDisplay());

603

Widget button = XtVaCreateManagedWidget(

604

@@ -283,7 +283,7 @@

605

XmNlabelPixmap, px,

606

XmNlabelType, XmPIXMAP,

607

XmNtopAttachment, XmATTACH_FORM,

608

- XmNrightAttachment, XmATTACH_FORM, 0);

609

+ XmNrightAttachment, XmATTACH_FORM, NULL);

610

XtAddCallback(button, XmNactivateCallback, AboutCB, (XtPointer)this);

611

AddLiteClue(button, "TCM logo");

612

return button;

613

@@ -298,31 +298,31 @@

614

xmRowColumnWidgetClass, parent,

615

XmNadjustLast, True,

616

XmNorientation, XmHORIZONTAL,

617

- XmNleftAttachment, XmATTACH_FORM, 0);

618

+ XmNleftAttachment, XmATTACH_FORM, NULL);

619

if (menubar)

620

XtVaSetValues(rc, XmNtopAttachment, XmATTACH_WIDGET,

621

- XmNtopWidget, menubar, 0);

622

+ XmNtopWidget, menubar, NULL);

623

if (logo)

624

XtVaSetValues(rc, XmNrightAttachment, XmATTACH_WIDGET,

625

- XmNrightWidget, logo, 0);

626

+ XmNrightWidget, logo, NULL);

627

XtVaCreateManagedWidget("Document Type: ",

628

xmLabelWidgetClass, rc,

629

- XmNalignment, XmALIGNMENT_BEGINNING, 0);

630

+ XmNalignment, XmALIGNMENT_BEGINNING, NULL);

631

documentType = XtVaCreateManagedWidget("DocumentType",

632

xmTextFieldWidgetClass, rc,

633

XmNcolumns, 15,

634

XmNeditable, False,

635

- XmNcursorPositionVisible, False, 0);

636

+ XmNcursorPositionVisible, False, NULL);

637

AddLiteClue(documentType,

638

"The type of document that is edited by this editor (fixed)");

639

XtVaCreateManagedWidget("Name: ",

640

xmLabelWidgetClass, rc,

641

- XmNalignment, XmALIGNMENT_BEGINNING, 0);

642

+ XmNalignment, XmALIGNMENT_BEGINNING, NULL);

643

documentName = XtVaCreateManagedWidget("DocumentName",

644

xmTextFieldWidgetClass, rc,

645

XmNeditable, True,

646

XmNcolumns, 10,

647

- XmNcursorPositionVisible, True, 0);

648

+ XmNcursorPositionVisible, True, NULL);

649

AddLiteClue(documentName,

650

"The document name. Can be changed (apply with <enter>)");

651

if (check(document))

652

@@ -331,11 +331,11 @@

653

if (Toolkit::HierarchicEditor(GetTool())) {

654

// XtVaCreateManagedWidget("Level: ",

655

// xmLabelWidgetClass, rc,

656

-// XmNalignment, XmALIGNMENT_BEGINNING, 0);

657

+// XmNalignment, XmALIGNMENT_BEGINNING, NULL);

658

// documentLevel = XtVaCreateManagedWidget("DocumentLevel",

659

// xmTextFieldWidgetClass, rc,

660

// XmNeditable, False,

661

-// XmNcursorPositionVisible, False, 0);

662

+// XmNcursorPositionVisible, False, NULL);

663

// AddLiteClue(documentLevel,

664

// "The current level in the document (fixed)");

665

}

666

@@ -352,11 +352,11 @@

667

return 0;

668

Widget rc = XtVaCreateWidget("ControlArea",

669

xmRowColumnWidgetClass, parent,

670

- XmNorientation, XmHORIZONTAL, 0);

671

+ XmNorientation, XmHORIZONTAL, NULL);

672

if (statusArea)

673

XtVaSetValues(rc, XmNtopWidget, statusArea,

674

- XmNtopAttachment, XmATTACH_WIDGET, 0);

675

- XtVaSetValues(rc, XmNbottomAttachment, XmATTACH_FORM, 0);

676

+ XmNtopAttachment, XmATTACH_WIDGET, NULL);

677

+ XtVaSetValues(rc, XmNbottomAttachment, XmATTACH_FORM, NULL);

678

XtManageChild(rc);

679

return rc;

680

}

681

@@ -368,20 +368,20 @@

682

return 0;

683

Widget rc = XtVaCreateWidget("StatusArea",

684

xmRowColumnWidgetClass, parent,

685

- XmNorientation, XmHORIZONTAL, 0);

686

+ XmNorientation, XmHORIZONTAL, NULL);

687

if (controlArea)

688

XtVaSetValues(rc, XmNbottomWidget, controlArea,

689

- XmNbottomAttachment, XmATTACH_WIDGET, 0);

690

+ XmNbottomAttachment, XmATTACH_WIDGET, NULL);

691

statusText = XtVaCreateManagedWidget("StatusText",

692

xmTextFieldWidgetClass, rc,

693

XmNeditable, False,

694

XmNcursorPositionVisible, False,

695

XmNshadowThickness, 0,

696

- XmNvalue, "...", 0);

697

+ XmNvalue, "...", NULL);

698

if (screenType <= SVGA)

699

- XtVaSetValues(statusText, XmNcolumns, 40, 0);

700

+ XtVaSetValues(statusText, XmNcolumns, 40, NULL);

701

else

702

- XtVaSetValues(statusText, XmNcolumns, 50, 0);

703

+ XtVaSetValues(statusText, XmNcolumns, 50, NULL);

704

XtManageChild(rc);

705

return rc;

706

}

707

@@ -394,7 +394,7 @@

708

Widget toggle = XtVaCreateManagedWidget(label,

709

xmToggleButtonWidgetClass, parent,

710

XmNlabelString, text,

711

- XmNset, Init, 0);

712

+ XmNset, Init, NULL);

713

XtAddCallback(toggle, XmNvalueChangedCallback, fun, clientData);

714

XmStringFree(text);

715

return toggle;

716

@@ -406,7 +406,7 @@

717

return;

718

Widget undoMenuItem = editMenu->GetMenuItem("Undo");

719

if (undoMenuItem) {

720

- XtVaSetValues(undoMenuItem, XmNsensitive, flag, 0);

721

+ XtVaSetValues(undoMenuItem, XmNsensitive, flag, NULL);

722

}

723

}

724

725

@@ -416,7 +416,7 @@

726

return;

727

Widget redoMenuItem = editMenu->GetMenuItem("Redo");

728

if (redoMenuItem)

729

- XtVaSetValues(redoMenuItem, XmNsensitive, flag, 0);

730

+ XtVaSetValues(redoMenuItem, XmNsensitive, flag, NULL);

731

}

732

733

void EditWindow::SetUndoName(const char *uname) {

734

@@ -426,7 +426,7 @@

735

XmString s = CreateXmString(uname);

736

Widget undoMenuItem = editMenu->GetMenuItem("Undo");

737

if (undoMenuItem)

738

- XtVaSetValues(undoMenuItem, XmNlabelString, s, 0);

739

+ XtVaSetValues(undoMenuItem, XmNlabelString, s, NULL);

740

XmStringFree(s);

741

}

742

743

@@ -437,7 +437,7 @@

744

XmString s = CreateXmString(uname);

745

Widget redoMenuItem = editMenu->GetMenuItem("Redo");

746

if (redoMenuItem)

747

- XtVaSetValues(redoMenuItem, XmNlabelString, s, 0);

748

+ XtVaSetValues(redoMenuItem, XmNlabelString, s, NULL);

749

XmStringFree(s);

750

}

751

752

@@ -523,7 +523,7 @@

753

754

void EditWindow::SetStatus(const char *message) {

755

if (statusText)

756

- XtVaSetValues(statusText, XmNvalue, message, 0);

757

+ XtVaSetValues(statusText, XmNvalue, message, NULL);

758

}

759

760

void EditWindow::SetStatus(const string *message) {

761

@@ -534,7 +534,7 @@

762

if (documentName) {

763

int columns = min(30, max(10, strlen(s)+2));

764

XtVaSetValues(documentName, XmNvalue, s,

765

- XmNcolumns, columns, 0);

766

+ XmNcolumns, columns, NULL);

767

// show document name also in the icon.

768

SetIconName(s);

769

}

770

@@ -548,7 +548,7 @@

771

if (documentType) {

772

int columns = min(30, max(10, strlen(s)+2));

773

XtVaSetValues(documentType, XmNvalue, s,

774

- XmNcolumns, columns, 0);

775

+ XmNcolumns, columns, NULL);

776

}

777

}

778

779

@@ -560,7 +560,7 @@

780

if (dirName) {

781

int columns = min(30, max(10, strlen(s)+4));

782

XtVaSetValues(dirName, XmNvalue, s,

783

- XmNcolumns, columns, 0);

784

+ XmNcolumns, columns, NULL);

785

}

786

}

787

788

@@ -570,7 +570,7 @@

789

790

void EditWindow::SetModified(bool set) {

791

if (modifiedToggle)

792

- XtVaSetValues(modifiedToggle, XmNset, set, 0);

793

+ XtVaSetValues(modifiedToggle, XmNset, set, NULL);

794

}

795

796

void EditWindow::AboutCB(Widget w, XtPointer, XtPointer) {

797

@@ -581,7 +581,7 @@

798

void EditWindow::SetDocumentLevel(const char *s) {

799

if (documentLevel)

800

XtVaSetValues(documentLevel, XmNvalue, s,

801

- XmNcolumns, strlen(s)+1, 0);

802

+ XmNcolumns, strlen(s)+1, NULL);

803

}

804

805

void EditWindow::SetDocumentLevel(const string *s) {

806

diff -Nur tcm-2.20+TSQD.orig/src/ed/startupwindow.c tcm-2.20+TSQD/src/ed/startupwindow.c

807

--- tcm-2.20+TSQD.orig/src/ed/startupwindow.c 2006-04-02 15:12:45.000000000 +0200

808

+++ tcm-2.20+TSQD/src/ed/startupwindow.c 2006-04-02 15:13:09.000000000 +0200

809

@@ -91,7 +91,7 @@

810

if (!check(parent))

811

return 0;

812

Widget startupForm = XtVaCreateWidget("StartupWindow", xmFormWidgetClass,

813

- parent, 0);

814

+ parent, NULL);

815

initDrawingWidth = config->GetDrawingWidth();

816

initDrawingHeight = config->GetDrawingHeight();

817

maxDrawingWidth = max(initDrawingWidth, config->GetDrawingMaxWidth());

818

@@ -188,27 +188,27 @@

819

XmNtopWidget, menuBar,

820

XmNleftAttachment, XmATTACH_FORM,

821

XmNbottomAttachment, XmATTACH_FORM,

822

- XmNrightAttachment, XmATTACH_FORM, 0);

823

+ XmNrightAttachment, XmATTACH_FORM, NULL);

824

mainForm = XtVaCreateWidget("form",

825

- xmFormWidgetClass, scrolledWindow, 0);

826

+ xmFormWidgetClass, scrolledWindow, NULL);

827

// *** GEN *** //

828

Widget frameGEN = XtVaCreateManagedWidget("frameGEN",

829

xmFrameWidgetClass, mainForm,

830

XmNleftAttachment, XmATTACH_FORM,

831

XmNrightAttachment, XmATTACH_FORM,

832

- 0);

833

+ NULL);

834

XtVaCreateManagedWidget("Generic Editors",

835

xmLabelWidgetClass, frameGEN,

836

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

837

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

838

Widget rowcolGEN = XtVaCreateManagedWidget("rowcolGEN",

839

- xmRowColumnWidgetClass, frameGEN, 0);

840

+ xmRowColumnWidgetClass, frameGEN, NULL);

841

AddToolEntry(rowcolGEN, 0); // TGD.

842

AddToolEntry(rowcolGEN, 9); // TGT.

843

AddToolEntry(rowcolGEN, 13); // TGTT.

844

XtVaCreateManagedWidget("separator",

845

xmSeparatorWidgetClass, mainForm,

846

XmNmargin, 8,

847

- XmNseparatorType, XmNO_LINE, 0);

848

+ XmNseparatorType, XmNO_LINE, NULL);

849

// *** SA (YSM) *** //

850

Widget frameSA = XtVaCreateManagedWidget("frameSA",

851

xmFrameWidgetClass, mainForm,

852

@@ -216,13 +216,13 @@

853

XmNtopWidget, frameGEN,

854

XmNleftAttachment, XmATTACH_FORM,

855

XmNrightAttachment, XmATTACH_FORM,

856

- 0);

857

+ NULL);

858

XtVaCreateManagedWidget("Structured Analysis Editors",

859

xmLabelWidgetClass, frameSA,

860

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

861

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

862

Widget rowcolSA = XtVaCreateManagedWidget("rowcolSA",

863

xmRowColumnWidgetClass, frameSA,

864

- XmNspacing, 4, 0);

865

+ XmNspacing, 4, NULL);

866

AddToolEntry(rowcolSA, 26); // ERD.

867

AddToolEntry(rowcolSA, 7); // EFD

868

AddToolEntry(rowcolSA, 3); // MST.

869

@@ -232,7 +232,7 @@

870

XtVaCreateManagedWidget("separator",

871

xmSeparatorWidgetClass, mainForm,

872

XmNmargin, 8,

873

- XmNseparatorType, XmNO_LINE, 0);

874

+ XmNseparatorType, XmNO_LINE, NULL);

875

// *** UML *** //

876

Widget frameUML = XtVaCreateManagedWidget("frameUML",

877

xmFrameWidgetClass, mainForm,

878

@@ -240,13 +240,13 @@

879

XmNtopWidget, frameSA,

880

XmNleftAttachment, XmATTACH_FORM,

881

XmNrightAttachment, XmATTACH_FORM,

882

- 0);

883

+ NULL);

884

XtVaCreateManagedWidget("UML Editors",

885

xmLabelWidgetClass, frameUML,

886

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

887

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

888

Widget rowcolUML = XtVaCreateManagedWidget("rowcolUML",

889

xmRowColumnWidgetClass, frameUML,

890

- XmNspacing, 4, 0);

891

+ XmNspacing, 4, NULL);

892

AddToolEntry(rowcolUML, 23); // TUCD.

893

AddToolEntry(rowcolUML, 18); // TSSD.

894

AddToolEntry(rowcolUML, 25); // TATD.

895

@@ -258,7 +258,7 @@

896

XtVaCreateManagedWidget("separator",

897

xmSeparatorWidgetClass, mainForm,

898

XmNmargin, 8,

899

- XmNseparatorType, XmNO_LINE, 0);

900

+ XmNseparatorType, XmNO_LINE, NULL);

901

// *** MISC *** //

902

Widget frameMISC = XtVaCreateManagedWidget("frameMISC",

903

xmFrameWidgetClass, mainForm,

904

@@ -266,12 +266,12 @@

905

XmNtopWidget, frameUML,

906

XmNleftAttachment, XmATTACH_FORM,

907

XmNrightAttachment, XmATTACH_FORM,

908

- 0);

909

+ NULL);

910

XtVaCreateManagedWidget("Miscellaneous Editors",

911

xmLabelWidgetClass, frameMISC,

912

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

913

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

914

Widget rowcolMISC = XtVaCreateManagedWidget("rowcolMISC",

915

- xmRowColumnWidgetClass, frameMISC, 0);

916

+ xmRowColumnWidgetClass, frameMISC, NULL);

917

AddToolEntry(rowcolMISC, 1); // ERD

918

AddToolEntry(rowcolMISC, 2); // CRD

919

AddToolEntry(rowcolMISC, 6); // DFD

920

@@ -282,14 +282,14 @@

921

XtVaCreateManagedWidget("separator",

922

xmSeparatorWidgetClass, mainForm,

923

XmNmargin, 8,

924

- XmNseparatorType, XmNO_LINE, 0);

925

+ XmNseparatorType, XmNO_LINE, NULL);

926

Widget formSTATUS = XtVaCreateManagedWidget("formSTATUS",

927

xmFormWidgetClass, mainForm,

928

XmNtopAttachment, XmATTACH_WIDGET,

929

XmNtopWidget, frameMISC,

930

XmNleftAttachment, XmATTACH_FORM,

931

XmNrightAttachment, XmATTACH_FORM,

932

- 0);

933

+ NULL);

934

int stColumns = 42;

935

if (WidthOfScreen(XtScreen(parent)) <= 1024)

936

// <= SVGA

937

@@ -302,7 +302,7 @@

938

XmNcolumns, stColumns,

939

XmNtopAttachment, XmATTACH_FORM,

940

XmNrightAttachment, XmATTACH_FORM,

941

- XmNleftAttachment, XmATTACH_FORM, 0);

942

+ XmNleftAttachment, XmATTACH_FORM, NULL);

943

XtManageChild(mainForm);

944

XtManageChild(scrolledWindow);

945

XtManageChild(parent);

946

@@ -357,7 +357,7 @@

947

viewMenu = new Menu(bar, Menu::PULLDOWN, "View", 0, viewItems);

948

helpMenu = new Menu(bar, Menu::PULLDOWN, "Help", 0, helpItems);

949

// tell bar which bar which button is the help menu

950

- XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), 0);

951

+ XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), NULL);

952

// Bar is done -- manage it

953

XtManageChild(bar);

954

return bar;

955

@@ -366,7 +366,7 @@

956

void StartupWindow::AddToolEntry(Widget parent, int i) {

957

XmString xmtt; char tt[MAXNAME]; char ttinfo[MAXNAME];

958

Widget form = XtVaCreateWidget("form",

959

- xmFormWidgetClass, parent, 0);

960

+ xmFormWidgetClass, parent, NULL);

961

Widget button = XtVaCreateManagedWidget(Toolkit::TOOL_NAMES[i],

962

xmPushButtonWidgetClass, form, XmNwidth, 50,

963

XmNheight, 22,

964

@@ -374,7 +374,7 @@

965

XmNbottomAttachment, XmATTACH_FORM,

966

XmNleftAttachment, XmATTACH_FORM,

967

XmNuserData, i,

968

- 0);

969

+ NULL);

970

strcpy(tt, Toolkit::DOCUMENT_TYPES[i]);

971

xmtt = CreateXmString(tt);

972

strcpy(ttinfo, Toolkit::DOCUMENT_TYPES_INFO[i]);

973

@@ -386,7 +386,7 @@

974

XmNtopAttachment, XmATTACH_FORM,

975

XmNbottomAttachment, XmATTACH_FORM,

976

XmNleftOffset, 6,

977

- 0);

978

+ NULL);

979

XtAddCallback(button, XmNactivateCallback, StartEditorCB,

980

(XtPointer *)this);

981

XmStringFree(xmtt);

982

@@ -600,7 +600,7 @@

983

984

void StartupWindow::SetStatus(const char *s) {

985

if (statusBar)

986

- XtVaSetValues(statusBar, XmNvalue, s, 0);

987

+ XtVaSetValues(statusBar, XmNvalue, s, NULL);

988

}

989

990

void StartupWindow::SetStatus(const string *s) {

991

@@ -661,7 +661,7 @@

992

void StartupWindow::StartEditorCB(Widget w, XtPointer clientData, XtPointer) {

993

StartupWindow *s = (StartupWindow *)clientData;

994

int num;

995

- XtVaGetValues(w, XmNuserData, &num, 0);

996

+ XtVaGetValues(w, XmNuserData, &num, NULL);

997

s->StartEditor(num);

998

}

999

1000

@@ -735,13 +735,13 @@

1001

Helper *hp = (Helper *)cd;

1002

hp->SetStatus("action: help");

1003

Helper::HelpTopicType tp;

1004

- XtVaGetValues(w, XmNuserData, &tp, 0);

1005

+ XtVaGetValues(w, XmNuserData, &tp, NULL);

1006

hp->Help(tp);

1007

}

1008

1009

void StartupWindow::Finalize() {

1010

Dimension fwd, fht;

1011

- XtVaGetValues(mainForm, XmNwidth, &fwd, XmNheight, &fht, 0);

1012

+ XtVaGetValues(mainForm, XmNwidth, &fwd, XmNheight, &fht, NULL);

1013

// std::cout << "mainForm width = " << fwd << std::endl;

1014

// std::cout << "mainForm height = " << fht << std::endl;

1015

Screen *screen = XtScreen(GetWidget());

1016

@@ -752,6 +752,6 @@

1017

Dimension ht = min(sht*9/10, fht+39); // experimentally

1018

// std::cout << "win width = " << wd << std::endl;

1019

// std::cout << "win height = " << ht << std::endl;

1020

- XtVaSetValues(GetWidget(), XmNwidth, wd, 0);

1021

- XtVaSetValues(GetWidget(), XmNheight, ht, 0);

1022

+ XtVaSetValues(GetWidget(), XmNwidth, wd, NULL);

1023

+ XtVaSetValues(GetWidget(), XmNheight, ht, NULL);

1024

}

1025

diff -Nur tcm-2.20+TSQD.orig/src/sd/bv/psstubs.c tcm-2.20+TSQD/src/sd/bv/psstubs.c

1026

--- tcm-2.20+TSQD.orig/src/sd/bv/psstubs.c 2004-07-21 19:54:14.000000000 +0200

1027

+++ tcm-2.20+TSQD/src/sd/bv/psstubs.c 2006-04-02 15:13:09.000000000 +0200

1028

@@ -25,6 +25,6 @@

1029

1030

void PSStubs::ShowSequenceCB(Widget w, XtPointer cd, XtPointer) {

1031

int num;

1032

- XtVaGetValues(w, XmNuserData, &num, 0);

1033

+ XtVaGetValues(w, XmNuserData, &num, NULL);

1034

((PSViewer *)cd)->SetShowSequences(num);

1035

}

1036

diff -Nur tcm-2.20+TSQD.orig/src/sd/bv/pswindow.c tcm-2.20+TSQD/src/sd/bv/pswindow.c

1037

--- tcm-2.20+TSQD.orig/src/sd/bv/pswindow.c 2004-07-21 19:54:20.000000000 +0200

1038

+++ tcm-2.20+TSQD/src/sd/bv/pswindow.c 2006-04-02 15:13:09.000000000 +0200

1039

@@ -75,7 +75,7 @@

1040

// // make the duplicate item insensitive.

1041

// Widget w1 = editMenu->GetMenuItem("Duplicate");

1042

// if (w1)

1043

-// XtVaSetValues(w1, XmNsensitive, False, 0);

1044

+// XtVaSetValues(w1, XmNsensitive, False, NULL);

1045

// return bar;

1046

//}

1047

1048

diff -Nur tcm-2.20+TSQD.orig/src/sd/dv/erstubs.c tcm-2.20+TSQD/src/sd/dv/erstubs.c

1049

--- tcm-2.20+TSQD.orig/src/sd/dv/erstubs.c 2004-07-21 19:53:12.000000000 +0200

1050

+++ tcm-2.20+TSQD/src/sd/dv/erstubs.c 2006-04-02 15:13:09.000000000 +0200

1051

@@ -36,7 +36,7 @@

1052

// get menu item label and look to which dir it corresponds

1053

XmString xms;

1054

xms = CreateXmString("");

1055

- XtVaGetValues(w, XmNlabelString, &xms, 0);

1056

+ XtVaGetValues(w, XmNlabelString, &xms, NULL);

1057

char *txt;

1058

ReadDirection::Type dir;

1059

if (XmStringGetLtoR(xms, XmFONTLIST_DEFAULT_TAG, &txt)) {

1060

diff -Nur tcm-2.20+TSQD.orig/src/sd/fv/dfwindow.c tcm-2.20+TSQD/src/sd/fv/dfwindow.c

1061

--- tcm-2.20+TSQD.orig/src/sd/fv/dfwindow.c 2004-07-21 19:56:20.000000000 +0200

1062

+++ tcm-2.20+TSQD/src/sd/fv/dfwindow.c 2006-04-02 15:13:09.000000000 +0200

1063

@@ -87,7 +87,7 @@

1064

1065

void DFWindow::SetDiagram(const char *s) {

1066

if (dfDiagram)

1067

- XtVaSetValues(dfDiagram, XmNvalue, s, 0);

1068

+ XtVaSetValues(dfDiagram, XmNvalue, s, NULL);

1069

}

1070

1071

void DFWindow::SetDiagram(const string *s) {

1072

@@ -108,9 +108,9 @@

1073

XmNtopAttachment, XmATTACH_WIDGET,

1074

XmNtopWidget, GetDocumentArea(),

1075

XmNleftAttachment, XmATTACH_FORM,

1076

- XmNorientation, XmVERTICAL, 0);

1077

- Widget t1 = XtVaCreateWidget("tiles1", xmRowColumnWidgetClass, t, 0);

1078

- Widget t2 = XtVaCreateWidget("tiles2", xmRowColumnWidgetClass, t, 0);

1079

+ XmNorientation, XmVERTICAL, NULL);

1080

+ Widget t1 = XtVaCreateWidget("tiles1", xmRowColumnWidgetClass, t, NULL);

1081

+ Widget t2 = XtVaCreateWidget("tiles2", xmRowColumnWidgetClass, t, NULL);

1082

CreateNodeIcons(t1);

1083

CreateEdgeIcons(t1);

1084

CreateDiagramField(t2);

1085

@@ -124,15 +124,15 @@

1086

void DFWindow::CreateDiagramField(Widget parent) {

1087

Widget frame = XtVaCreateManagedWidget("tiles_frame3",

1088

xmFrameWidgetClass, parent,

1089

- XmNshadowType, XmSHADOW_ETCHED_IN, 0);

1090

+ XmNshadowType, XmSHADOW_ETCHED_IN, NULL);

1091

Widget rc = XtVaCreateWidget("rc3", xmRowColumnWidgetClass, frame,

1092

- XmNentryAlignment, XmALIGNMENT_CENTER, 0);

1093

- XtVaCreateManagedWidget("Diagram", xmLabelWidgetClass, rc, 0);

1094

+ XmNentryAlignment, XmALIGNMENT_CENTER, NULL);

1095

+ XtVaCreateManagedWidget("Diagram", xmLabelWidgetClass, rc, NULL);

1096

dfDiagram = XtVaCreateManagedWidget("DFDiagram",

1097

xmTextFieldWidgetClass, rc,

1098

XmNcolumns, 5,

1099

XmNeditable, True,

1100

- XmNcursorPositionVisible, True, 0);

1101

+ XmNcursorPositionVisible, True, NULL);

1102

XtAddCallback(dfDiagram, XmNactivateCallback,

1103

DFStubs::ChangeDiagramCB, (XtPointer)GetDocument());

1104

AddLiteClue(dfDiagram, "Set diagram index (apply with <return>)");

1105

diff -Nur tcm-2.20+TSQD.orig/src/sd/tr/trwindow.c tcm-2.20+TSQD/src/sd/tr/trwindow.c

1106

--- tcm-2.20+TSQD.orig/src/sd/tr/trwindow.c 2004-07-21 19:55:43.000000000 +0200

1107

+++ tcm-2.20+TSQD/src/sd/tr/trwindow.c 2006-04-02 15:13:09.000000000 +0200

1108

@@ -72,7 +72,7 @@

1109

// make the duplicate item insensitive.

1110

Widget w1 = editMenu->GetMenuItem("Duplicate");

1111

if (w1)

1112

- XtVaSetValues(w1, XmNsensitive, False, 0);

1113

+ XtVaSetValues(w1, XmNsensitive, False, NULL);

1114

return bar;

1115

}

1116

1117

@@ -89,14 +89,14 @@

1118

// create a frame

1119

Widget frame = XtVaCreateManagedWidget("layout_tiles_frame1",

1120

xmFrameWidgetClass, parent,

1121

- XmNshadowType, XmSHADOW_ETCHED_IN, 0);

1122

+ XmNshadowType, XmSHADOW_ETCHED_IN, NULL);

1123

// create the label

1124

XtVaCreateManagedWidget("Layout",

1125

xmLabelWidgetClass, frame,

1126

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

1127

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

1128

// create a rowcolumn

1129

Widget rc = XtVaCreateWidget("rc1", xmRowColumnWidgetClass, frame,

1130

- XmNentryAlignment, XmALIGNMENT_CENTER, 0);

1131

+ XmNentryAlignment, XmALIGNMENT_CENTER, NULL);

1132

// create a radiobox for the tiles

1133

XtSetArg(args[i], XmNradioAlwaysOne, True); i++;

1134

char wname[8] = "Layout";

1135

@@ -112,7 +112,7 @@

1136

XmNlabelType, XmSTRING,

1137

XmNlabelString, lb1,

1138

XmNuserData, (XtPointer)0,

1139

- XmNalignment, XmALIGNMENT_CENTER, 0);

1140

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

1141

XtAddCallback(editButton, XmNvalueChangedCallback,

1142

TRWindow::LayoutCB, (XtPointer)this);

1143

AddLiteClue(editButton, "Edit mode in which document is drawn as a graph");

1144

@@ -123,7 +123,7 @@

1145

XmNlabelType, XmSTRING,

1146

XmNhighlightThickness, 0,

1147

XmNuserData, (XtPointer)1,

1148

- XmNalignment, XmALIGNMENT_CENTER, 0);

1149

+ XmNalignment, XmALIGNMENT_CENTER, NULL);

1150

XtAddCallback(treeButton, XmNvalueChangedCallback,

1151

TRWindow::LayoutCB, (XtPointer)this);

1152

AddLiteClue(treeButton, "View mode in which document has a forked tree layout");

1153

@@ -179,13 +179,13 @@

1154

void TRWindow::SetSensitive(Menu *menu, const char *label, bool b) {

1155

Widget w = menu->GetMenuItem(label);

1156

if (w)

1157

- XtVaSetValues(w, XmNsensitive, b, 0);

1158

+ XtVaSetValues(w, XmNsensitive, b, NULL);

1159

}

1160

1161

void TRWindow::LayoutCB(Widget w, XtPointer cd, XtPointer) {

1162

if (XmToggleButtonGetState(w)) {

1163

int num;

1164

- XtVaGetValues(w, XmNuserData, &num, 0);

1165

+ XtVaGetValues(w, XmNuserData, &num, NULL);

1166

((TRWindow *)cd)->SetLayout(num);

1167

}

1168

}

1169

diff -Nur tcm-2.20+TSQD.orig/src/tb/tablewindow.c tcm-2.20+TSQD/src/tb/tablewindow.c

1170

--- tcm-2.20+TSQD.orig/src/tb/tablewindow.c 2004-07-21 19:51:26.000000000 +0200

1171

+++ tcm-2.20+TSQD/src/tb/tablewindow.c 2006-04-02 15:13:09.000000000 +0200

1172

@@ -169,11 +169,11 @@

1173

SetScaleValue(CreateScaleValue(parent));

1174

XtVaSetValues(GetStatusArea(), XmNleftAttachment, XmATTACH_WIDGET,

1175

XmNleftOffset, 20,

1176

- XmNleftWidget, GetArrowButtons(), 0);

1177

+ XmNleftWidget, GetArrowButtons(), NULL);

1178

XtVaSetValues(GetScrolledWindow(), XmNleftAttachment, XmATTACH_FORM,

1179

XmNleftOffset, 20,

1180

XmNbottomAttachment, XmATTACH_WIDGET,

1181

- XmNbottomWidget, GetArrowButtons(), 0);

1182

+ XmNbottomWidget, GetArrowButtons(), NULL);

1183

}

1184

1185

Widget TableWindow::CreateMenuBar(Widget parent) {

1186

@@ -206,7 +206,7 @@

1187

documentItems);

1188

helpMenu = new Menu(bar, Menu::PULLDOWN, "Help", 0, helpItems);

1189

// tell bar which bar which button is the help menu

1190

- XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), 0);

1191

+ XtVaSetValues(bar, XmNmenuHelpWidget, helpMenu->GetWidget(), NULL);

1192

// Bar is done -- manage it

1193

XtManageChild(bar);

1194

return bar;

1195

diff -Nur tcm-2.20+TSQD.orig/src/ui/application.c tcm-2.20+TSQD/src/ui/application.c

1196

--- tcm-2.20+TSQD.orig/src/ui/application.c 2004-07-21 19:48:37.000000000 +0200

1197

+++ tcm-2.20+TSQD/src/ui/application.c 2006-04-02 15:13:09.000000000 +0200

1198

@@ -109,7 +109,7 @@

1199

(char **)XResources::classicColorResources :

1200

(char **)XResources::modernColorResources) :

1201

(char **)XResources::monoResources,

1202

- XmNmappedWhenManaged, False, 0));

1203

+ XmNmappedWhenManaged, False, NULL));

1204

// The Application class is less likely to need to handle

1205

// "surprise" widget destruction than other classes, but

1206

// we might as well install a callback to be safe and consistent

1207

@@ -132,7 +132,7 @@

1208

LoadColorFile();

1209

1210

// lesstif cannot accept a window of 0 width and height.

1211

- XtVaSetValues(GetWidget(), XmNwidth, 10, XmNheight, 10, 0);

1212

+ XtVaSetValues(GetWidget(), XmNwidth, 10, XmNheight, 10, NULL);

1213

1214

// Force the shell window to exist so dialogs popped up from

1215

// this shell behave correctly

1216

@@ -179,7 +179,7 @@

1217

if (!privateCmap) {

1218

Colormap cmap = DefaultColormapOfScreen(XtScreen(GetWidget()));

1219

cmap = XCopyColormapAndFree(display, cmap);

1220

- XtVaSetValues(GetWidget(), XmNcolormap, cmap, 0);

1221

+ XtVaSetValues(GetWidget(), XmNcolormap, cmap, NULL);

1222

}

1223

privateCmap = True;

1224

}

1225

diff -Nur tcm-2.20+TSQD.orig/src/ui/bitmap.c tcm-2.20+TSQD/src/ui/bitmap.c

1226

--- tcm-2.20+TSQD.orig/src/ui/bitmap.c 2004-07-21 19:48:36.000000000 +0200

1227

+++ tcm-2.20+TSQD/src/ui/bitmap.c 2006-04-02 15:13:09.000000000 +0200

1228

@@ -37,7 +37,7 @@

1229

1230

Pixmap Bitmap::CreatePixmap(Widget w, Display *display) const {

1231

Pixel fg, bg;

1232

- XtVaGetValues(w, XmNforeground, &fg, XmNbackground, &bg, 0);

1233

+ XtVaGetValues(w, XmNforeground, &fg, XmNbackground, &bg, NULL);

1234

Screen *screen = XtScreen(w);

1235

return XCreatePixmapFromBitmapData(display,

1236

RootWindowOfScreen(screen),

1237

diff -Nur tcm-2.20+TSQD.orig/src/ui/colorchooserdialog.c tcm-2.20+TSQD/src/ui/colorchooserdialog.c

1238

--- tcm-2.20+TSQD.orig/src/ui/colorchooserdialog.c 2004-07-21 19:48:29.000000000 +0200

1239

+++ tcm-2.20+TSQD/src/ui/colorchooserdialog.c 2006-04-02 15:13:09.000000000 +0200

1240

@@ -60,19 +60,19 @@

1241

XtAddCallback(GetList(), XmNbrowseSelectionCallback,

1242

UpdateColorCB, this);

1243

Widget rc = XtVaCreateManagedWidget("rc",

1244

- xmRowColumnWidgetClass, GetWidget(), 0);

1245

+ xmRowColumnWidgetClass, GetWidget(), NULL);

1246

fillToggle = XtVaCreateManagedWidget("fill them",

1247

xmToggleButtonWidgetClass, rc,

1248

- XmNset, True, 0);

1249

+ XmNset, True, NULL);

1250

Widget rc2 = XtVaCreateManagedWidget("rc2",

1251

xmRowColumnWidgetClass, rc,

1252

- XmNorientation, XmHORIZONTAL, 0);

1253

- XtVaCreateManagedWidget("preview: ", xmLabelWidgetClass, rc2, 0);

1254

+ XmNorientation, XmHORIZONTAL, NULL);

1255

+ XtVaCreateManagedWidget("preview: ", xmLabelWidgetClass, rc2, NULL);

1256

colorLabel = XtVaCreateManagedWidget(

1257

"", xmTextFieldWidgetClass, rc2,

1258

XmNeditable, False,

1259

- XmNcursorPositionVisible, False, 0);

1260

- XtVaGetValues(GetWidget(), XmNcolormap, &colormap, 0);

1261

+ XmNcursorPositionVisible, False, NULL);

1262

+ XtVaGetValues(GetWidget(), XmNcolormap, &colormap, NULL);

1263

}

1264

1265

void ColorChooserDialog::UpdateColorCB(Widget, XtPointer p, XtPointer cbs) {

1266

@@ -113,7 +113,7 @@

1267

return;

1268

}

1269

}

1270

- XtVaSetValues(colorLabel, XmNbackground, pixel, 0);

1271

+ XtVaSetValues(colorLabel, XmNbackground, pixel, NULL);

1272

}

1273

}

1274

1275

@@ -145,7 +145,7 @@

1276

if (!check(fillToggle))

1277

return;

1278

XmString text_string = CreateXmString(txt);

1279

- XtVaSetValues(fillToggle, XmNlabelString, text_string, 0);

1280

+ XtVaSetValues(fillToggle, XmNlabelString, text_string, NULL);

1281

XmStringFree(text_string);

1282

}

1283

1284

diff -Nur tcm-2.20+TSQD.orig/src/ui/dialog.c tcm-2.20+TSQD/src/ui/dialog.c

1285

--- tcm-2.20+TSQD.orig/src/ui/dialog.c 2004-07-21 19:48:24.000000000 +0200

1286

+++ tcm-2.20+TSQD/src/ui/dialog.c 2006-04-02 15:13:09.000000000 +0200

1287

@@ -49,7 +49,7 @@

1288

strncpy(t, title, MAXTITLE-1);

1289

t[MAXTITLE-1] = '\0';

1290

XmString s = CreateXmString(t);

1291

- XtVaSetValues(GetWidget(), XmNdialogTitle, s, 0);

1292

+ XtVaSetValues(GetWidget(), XmNdialogTitle, s, NULL);

1293

XmStringFree(s);

1294

}

1295

1296

@@ -61,7 +61,7 @@

1297

if (!check(GetWidget()))

1298

return;

1299

XmString s = CreateXmString("");

1300

- XtVaGetValues(GetWidget(), XmNdialogTitle, &s, 0);

1301

+ XtVaGetValues(GetWidget(), XmNdialogTitle, &s, NULL);

1302

char *str;

1303

if (XmStringGetLtoR(s, XmFONTLIST_DEFAULT_TAG, &str)) {

1304

strncpy(title, str, MAXTITLE-1);

1305

@@ -84,13 +84,13 @@

1306

XtVaSetValues(GetWidget(),

1307

XmNdialogStyle,

1308

(b?XmDIALOG_FULL_APPLICATION_MODAL:XmDIALOG_MODELESS),

1309

- 0);

1310

+ NULL);

1311

}

1312

1313

void Dialog::SetAutoUnmanage(bool b) {

1314

autoUnmanage = b;

1315

if (GetWidget())

1316

- XtVaSetValues(GetWidget(), XmNautoUnmanage, b, 0);

1317

+ XtVaSetValues(GetWidget(), XmNautoUnmanage, b, NULL);

1318

}

1319

1320

void Dialog::SetOKCallback(XtCallbackProc fun, XtPointer clientData) {

1321

@@ -127,7 +127,7 @@

1322

if (!check(GetWidget()))

1323

return;

1324

XmString t = CreateXmString(txt);

1325

- XtVaSetValues(GetWidget(), XmNokLabelString, t, 0);

1326

+ XtVaSetValues(GetWidget(), XmNokLabelString, t, NULL);

1327

XmStringFree(t);

1328

}

1329

1330

@@ -135,7 +135,7 @@

1331

if (!check(GetWidget()))

1332

return;

1333

XmString t = CreateXmString(txt);

1334

- XtVaSetValues(GetWidget(), XmNcancelLabelString, t, 0);

1335

+ XtVaSetValues(GetWidget(), XmNcancelLabelString, t, NULL);

1336

XmStringFree(t);

1337

}

1338

1339

@@ -143,7 +143,7 @@

1340

if (!check(GetWidget()))

1341

return;

1342

XmString t = CreateXmString(txt);

1343

- XtVaSetValues(GetWidget(), XmNhelpLabelString, t, 0);

1344

+ XtVaSetValues(GetWidget(), XmNhelpLabelString, t, NULL);

1345

XmStringFree(t);

1346

}

1347

1348

@@ -214,7 +214,7 @@

1349

&Dialog::DestroyWidgetCB, 0);

1350

XtAddCallback(GetWidget(), XmNdestroyCallback,

1351

&Dialog::DestroyCB, (XtPointer)this);

1352

- XtVaSetValues(GetWidget(), XmNdeleteResponse, XmDESTROY, 0);

1353

+ XtVaSetValues(GetWidget(), XmNdeleteResponse, XmDESTROY, NULL);

1354

}

1355

else {

1356

XtRemoveCallback(GetWidget(), XmNokCallback,

1357

@@ -223,7 +223,7 @@

1358

&Dialog::DestroyWidgetCB, 0);

1359

XtRemoveCallback(GetWidget(), XmNdestroyCallback,

1360

&Dialog::DestroyCB, (XtPointer)this);

1361

- XtVaSetValues(GetWidget(), XmNdeleteResponse, XmUNMAP, 0);

1362

+ XtVaSetValues(GetWidget(), XmNdeleteResponse, XmUNMAP, NULL);

1363

}

1364

}

1365

1366

@@ -269,8 +269,8 @@

1367

// Temporarily set value of XmNmappedWhenManaged

1368

// to stop the dialog from popping up right away

1369

bool mappedWhenManaged = False;

1370

- XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, 0);

1371

- XtVaSetValues(shell, XmNmappedWhenManaged, False, 0);

1372

+ XtVaGetValues(shell, XmNmappedWhenManaged, &mappedWhenManaged, NULL);

1373

+ XtVaSetValues(shell, XmNmappedWhenManaged, False, NULL);

1374

// Manage the dialog

1375

XtManageChild(GetWidget());

1376

// Get the pointer position (x, y)

1377

@@ -300,9 +300,9 @@

1378

if (y > maxY)

1379

y = maxY;

1380

// Set desired window position in the DialogShell.

1381

- XtVaSetValues(shell, XmNx, x, XmNy, y, 0);

1382

+ XtVaSetValues(shell, XmNx, x, XmNy, y, NULL);

1383

// Map the widget

1384

XtMapWidget(shell);

1385

// Restore the value of XmNmappedWhenManaged

1386

- XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, 0);

1387

+ XtVaSetValues(shell, XmNmappedWhenManaged, mappedWhenManaged, NULL);

1388

}

1389

diff -Nur tcm-2.20+TSQD.orig/src/ui/dumpwidgettree.c tcm-2.20+TSQD/src/ui/dumpwidgettree.c

1390

--- tcm-2.20+TSQD.orig/src/ui/dumpwidgettree.c 2004-07-21 19:48:33.000000000 +0200

1391

+++ tcm-2.20+TSQD/src/ui/dumpwidgettree.c 2006-04-02 15:13:09.000000000 +0200

1392

@@ -51,7 +51,7 @@

1393

}

1394

XtVaGetValues(w,

1395

XmNchildren, &list,

1396

- XmNnumChildren, &num_children, 0);

1397

+ XmNnumChildren, &num_children, NULL);

1398

printf("%s> %s has %d %s:\n", tmp,

1399

XtName(w), num_children,

1400

num_children == 1 ? "child" : "children");

1401

diff -Nur tcm-2.20+TSQD.orig/src/ui/fileselectiondialog.c tcm-2.20+TSQD/src/ui/fileselectiondialog.c

1402

--- tcm-2.20+TSQD.orig/src/ui/fileselectiondialog.c 2004-07-21 19:48:01.000000000 +0200

1403

+++ tcm-2.20+TSQD/src/ui/fileselectiondialog.c 2006-04-02 15:13:09.000000000 +0200

1404

@@ -71,7 +71,7 @@

1405

XmNfileTypeMask, fileTypeMask,

1406

XmNdirListLabelString, dirLabel,

1407

XmNfileListLabelString, fileLabel,

1408

- XmNpattern, pattern, 0);

1409

+ XmNpattern, pattern, NULL);

1410

if (fileLabel)

1411

XmStringFree(fileLabel);

1412

if (dirLabel)

1413

@@ -87,7 +87,7 @@

1414

if (!check(GetWidget()))

1415

return;

1416

XmString dir = CreateXmString(d);

1417

- XtVaSetValues(GetWidget(), XmNdirectory, dir, 0);

1418

+ XtVaSetValues(GetWidget(), XmNdirectory, dir, NULL);

1419

XmStringFree(dir);

1420

}

1421

1422

@@ -102,8 +102,8 @@

1423

// Update the file list in the dialog

1424

XmString pattern = CreateXmString("");

1425

XmString dir = CreateXmString("");

1426

- XtVaGetValues(GetWidget(), XmNpattern, &pattern, 0);

1427

- XtVaGetValues(GetWidget(), XmNdirectory, &dir, 0);

1428

+ XtVaGetValues(GetWidget(), XmNpattern, &pattern, NULL);

1429

+ XtVaGetValues(GetWidget(), XmNdirectory, &dir, NULL);

1430

char *str1, *str2;

1431

XmStringGetLtoR(dir, XmFONTLIST_DEFAULT_TAG, &str1);

1432

XmStringGetLtoR(pattern, XmFONTLIST_DEFAULT_TAG, &str2);

1433

@@ -129,7 +129,7 @@

1434

1435

// Force the default name in the text entry field.

1436

dirSpec = CreateXmString(f);

1437

- XtVaSetValues(GetWidget(), XmNtextString, dirSpec, 0);

1438

+ XtVaSetValues(GetWidget(), XmNtextString, dirSpec, NULL);

1439

string f1 = f;

1440

System::GiveFile(&f1, &defaultFile);

1441

if (dirSpec)

1442

@@ -145,9 +145,9 @@

1443

DeselectAllItems();

1444

// make sure file selection box has an acceptable minimal width.

1445

short w;

1446

- XtVaGetValues(GetText(), XmNcolumns, &w, 0);

1447

+ XtVaGetValues(GetText(), XmNcolumns, &w, NULL);

1448

if (w < 40)

1449

- XtVaSetValues(GetText(), XmNcolumns, 40, 0);

1450

+ XtVaSetValues(GetText(), XmNcolumns, 40, NULL);

1451

Dialog::Popup();

1452

}

1453

1454

@@ -170,7 +170,7 @@

1455

return;

1456

XmString d = CreateXmString("");

1457

char *str;

1458

- XtVaGetValues(GetWidget(), XmNdirectory, &d, 0);

1459

+ XtVaGetValues(GetWidget(), XmNdirectory, &d, NULL);

1460

if (XmStringGetLtoR(d, XmFONTLIST_DEFAULT_TAG, &str)) {

1461

strcpy(dir, str);

1462

XtFree(str);

1463

@@ -201,14 +201,14 @@

1464

char wname[MAXNAME] = "frame";

1465

menuFrame = XmCreateFrame(GetWidget(), wname, args, i);

1466

Widget rc = XtVaCreateWidget("rc", xmRowColumnWidgetClass, menuFrame,

1467

- XmNorientation, XmHORIZONTAL, 0);

1468

+ XmNorientation, XmHORIZONTAL, NULL);

1469

XtVaCreateManagedWidget("label", xmLabelWidgetClass,

1470

- rc, XmNlabelString, ls, 0);

1471

+ rc, XmNlabelString, ls, NULL);

1472

strcpy(wname, "menu");

1473

menu = XmCreateOptionMenu(rc, wname, 0, 0);

1474

strcpy(wname, "pane");

1475

pane = XmCreatePulldownMenu(rc, wname, 0, 0);

1476

- XtVaSetValues(menu, XmNsubMenuId, pane, 0);

1477

+ XtVaSetValues(menu, XmNsubMenuId, pane, NULL);

1478

XtAddCallback(pane, XmNentryCallback, OptionChangedCB, this);

1479

for (items->first(); !items->done(); items->next()) {

1480

XtCreateManagedWidget(items->cur()->getstr(),

1481

@@ -255,18 +255,18 @@

1482

// only setting the label of option button does not work.

1483

Widget *wlist;

1484

int numc;

1485

- XtVaGetValues(pane, XmNchildren, &wlist, 0);

1486

- XtVaGetValues(pane, XmNnumChildren, &numc, 0);

1487

+ XtVaGetValues(pane, XmNchildren, &wlist, NULL);

1488

+ XtVaGetValues(pane, XmNnumChildren, &numc, NULL);

1489

XmString s1 = CreateXmString(s->getstr());

1490

for (int i=0; i<numc; i++) {

1491

XmString s2 = CreateXmString("");

1492

- XtVaGetValues(wlist[i], XmNlabelString, &s2, 0);

1493

+ XtVaGetValues(wlist[i], XmNlabelString, &s2, NULL);

1494

char *str;

1495

if (XmStringGetLtoR(s2, XmFONTLIST_DEFAULT_TAG, &str)) {

1496

if (strstr(str, s->getstr())) {

1497

- XtVaSetValues(pane, XmNmenuHistory, wlist[i], 0);

1498

+ XtVaSetValues(pane, XmNmenuHistory, wlist[i], NULL);

1499

Widget l = XmOptionButtonGadget(menu);

1500

- XtVaSetValues(l, XmNlabelString, s1, 0);

1501

+ XtVaSetValues(l, XmNlabelString, s1, NULL);

1502

XmStringFree(s1);

1503

XmStringFree(s2);

1504

XtFree(str);

1505

@@ -285,7 +285,7 @@

1506

char *str;

1507

XmString xs = CreateXmString("");

1508

Widget l = XmOptionButtonGadget(menu);

1509

- XtVaGetValues(l, XmNlabelString, &xs, 0);

1510

+ XtVaGetValues(l, XmNlabelString, &xs, NULL);

1511

if (XmStringGetLtoR(xs, XmFONTLIST_DEFAULT_TAG, &str)) {

1512

*item = str;

1513

XtFree(str);

1514

diff -Nur tcm-2.20+TSQD.orig/src/ui/finddialog.c tcm-2.20+TSQD/src/ui/finddialog.c

1515

--- tcm-2.20+TSQD.orig/src/ui/finddialog.c 2004-07-21 19:48:24.000000000 +0200

1516

+++ tcm-2.20+TSQD/src/ui/finddialog.c 2006-04-02 15:13:09.000000000 +0200

1517

@@ -60,30 +60,30 @@

1518

ManageSelectionLabel(False);

1519

1520

form = XtVaCreateWidget("form",

1521

- xmFormWidgetClass, GetWidget(), 0);

1522

+ xmFormWidgetClass, GetWidget(), NULL);

1523

SetSelectionLabel(XtVaCreateManagedWidget("String to Find",

1524

xmLabelWidgetClass, form,

1525

XmNleftAttachment, XmATTACH_FORM,

1526

- XmNtopAttachment, XmATTACH_FORM, 0));

1527

+ XmNtopAttachment, XmATTACH_FORM, NULL));

1528

SetText(XtVaCreateManagedWidget("find_text",

1529

xmTextFieldWidgetClass, form,

1530

XmNleftAttachment, XmATTACH_FORM,

1531

XmNrightAttachment, XmATTACH_FORM,

1532

XmNtopAttachment, XmATTACH_WIDGET,

1533

- XmNtopWidget, GetSelectionLabel(), 0));

1534

+ XmNtopWidget, GetSelectionLabel(), NULL));

1535

toggleRC = XtVaCreateManagedWidget("toggleRC",

1536

xmRowColumnWidgetClass, form,

1537

XmNorientation, XmHORIZONTAL,

1538

- XmNleftAttachment, XmATTACH_FORM, 0);

1539

+ XmNleftAttachment, XmATTACH_FORM, NULL);

1540

sensitiveToggle = XtVaCreateManagedWidget("case sensitive",

1541

xmToggleButtonWidgetClass, toggleRC,

1542

- XmNset, False, 0);

1543

+ XmNset, False, NULL);

1544

substringToggle = XtVaCreateWidget("substring",

1545

xmToggleButtonWidgetClass, toggleRC,

1546

- XmNset, True, 0);

1547

+ XmNset, True, NULL);

1548

nameOnlyToggle = XtVaCreateWidget("name only",

1549

xmToggleButtonWidgetClass, toggleRC,

1550

- XmNset, False, 0);

1551

+ XmNset, False, NULL);

1552

AttachToggles();

1553

XtManageChild(form);

1554

}

1555

@@ -91,7 +91,7 @@

1556

void FindDialog::AttachToggles() {

1557

XtVaSetValues(toggleRC,

1558

XmNtopAttachment, XmATTACH_WIDGET,

1559

- XmNtopWidget, GetText(), 0);

1560

+ XmNtopWidget, GetText(), NULL);

1561

}

1562

1563

void FindDialog::ManageSensitiveToggle(bool b) {

1564

diff -Nur tcm-2.20+TSQD.orig/src/ui/fontchooserdialog.c tcm-2.20+TSQD/src/ui/fontchooserdialog.c

1565

--- tcm-2.20+TSQD.orig/src/ui/fontchooserdialog.c 2004-07-21 19:48:43.000000000 +0200

1566

+++ tcm-2.20+TSQD/src/ui/fontchooserdialog.c 2006-04-02 15:13:09.000000000 +0200

1567

@@ -105,7 +105,7 @@

1568

SetHelpButtonLabel("Default");

1569

// underlinedToggle = XtVaCreateManagedWidget("underlined",

1570

// xmToggleButtonWidgetClass, GetWidget(),

1571

- // XmNset, False, 0);

1572

+ // XmNset, False, NULL);

1573

ChooseDefault();

1574

SetToggleChangedCallback(0, ShowExampleCB, this);

1575

SetToggleChangedCallback(1, ShowExampleCB, this);

1576

@@ -137,7 +137,7 @@

1577

XFontStruct *fs = exampleFont->GetXFontStruct();

1578

XmFontList fl = XmFontListCreate(fs,

1579

XmSTRING_DEFAULT_CHARSET);

1580

- XtVaSetValues(GetText(), XmNfontList, fl, 0);

1581

+ XtVaSetValues(GetText(), XmNfontList, fl, NULL);

1582

XmFontListFree(fl);

1583

}

1584

}

1585

diff -Nur tcm-2.20+TSQD.orig/src/ui/lineenddialog.c tcm-2.20+TSQD/src/ui/lineenddialog.c

1586

--- tcm-2.20+TSQD.orig/src/ui/lineenddialog.c 2004-07-21 19:48:40.000000000 +0200

1587

+++ tcm-2.20+TSQD/src/ui/lineenddialog.c 2006-04-02 15:13:09.000000000 +0200

1588

@@ -163,9 +163,9 @@

1589

List<Widget> *tl1 = (*GetToggleList())[0];

1590

List<Widget> *tl2 = (*GetToggleList())[1];

1591

XtVaSetValues(XtParent((*tl1)[0]),

1592

- XmNnumColumns, 4, XmNorientation, XmHORIZONTAL, 0);

1593

+ XmNnumColumns, 4, XmNorientation, XmHORIZONTAL, NULL);

1594

XtVaSetValues(XtParent((*tl2)[0]),

1595

- XmNnumColumns, 4, XmNorientation, XmHORIZONTAL, 0);

1596

+ XmNnumColumns, 4, XmNorientation, XmHORIZONTAL, NULL);

1597

for (int k=1; k<=LineEnd::NUMTYPES; k++) {

1598

LineEnd::Type t = (LineEnd::Type)k;

1599

string s1;

1600

diff -Nur tcm-2.20+TSQD.orig/src/ui/linestyledialog.c tcm-2.20+TSQD/src/ui/linestyledialog.c

1601

--- tcm-2.20+TSQD.orig/src/ui/linestyledialog.c 2004-07-21 19:48:23.000000000 +0200

1602

+++ tcm-2.20+TSQD/src/ui/linestyledialog.c 2006-04-02 15:13:09.000000000 +0200

1603

@@ -94,5 +94,5 @@

1604

List<Widget> *tl = (*GetToggleList())[0];

1605

Widget rc = XtParent((*tl)[0]);

1606

XtVaSetValues(rc, XmNnumColumns, 3,

1607

- XmNorientation, XmHORIZONTAL, 0);

1608

+ XmNorientation, XmHORIZONTAL, NULL);

1609

}

1610

diff -Nur tcm-2.20+TSQD.orig/src/ui/linestylesidedialog.c tcm-2.20+TSQD/src/ui/linestylesidedialog.c

1611

--- tcm-2.20+TSQD.orig/src/ui/linestylesidedialog.c 2004-07-21 19:48:48.000000000 +0200

1612

+++ tcm-2.20+TSQD/src/ui/linestylesidedialog.c 2006-04-02 15:13:09.000000000 +0200

1613

@@ -82,5 +82,5 @@

1614

Widget rc = XtParent((*tl)[1]);

1615

XtVaSetValues(rc, XmNnumColumns, 3,

1616

XmNorientation,

1617

- XmHORIZONTAL, 0);

1618

+ XmHORIZONTAL, NULL);

1619

}

1620

diff -Nur tcm-2.20+TSQD.orig/src/ui/linewidthdialog.c tcm-2.20+TSQD/src/ui/linewidthdialog.c

1621

--- tcm-2.20+TSQD.orig/src/ui/linewidthdialog.c 2004-07-21 19:48:04.000000000 +0200

1622

+++ tcm-2.20+TSQD/src/ui/linewidthdialog.c 2006-04-02 15:13:09.000000000 +0200

1623

@@ -106,5 +106,5 @@

1624

List<Widget> *tl = (*GetToggleList())[0];

1625

Widget rc = XtParent((*tl)[0]);

1626

XtVaSetValues(rc, XmNnumColumns, 3,

1627

- XmNorientation, XmHORIZONTAL, 0);

1628

+ XmNorientation, XmHORIZONTAL, NULL);

1629

}

1630

diff -Nur tcm-2.20+TSQD.orig/src/ui/linewidthsidedialog.c tcm-2.20+TSQD/src/ui/linewidthsidedialog.c

1631

--- tcm-2.20+TSQD.orig/src/ui/linewidthsidedialog.c 2004-07-21 19:48:08.000000000 +0200

1632

+++ tcm-2.20+TSQD/src/ui/linewidthsidedialog.c 2006-04-02 15:13:09.000000000 +0200

1633

@@ -82,5 +82,5 @@

1634

Widget rc = XtParent((*tl)[1]);

1635

XtVaSetValues(rc, XmNnumColumns, 3,

1636

XmNorientation,

1637

- XmHORIZONTAL, 0);

1638

+ XmHORIZONTAL, NULL);

1639

}

1640

diff -Nur tcm-2.20+TSQD.orig/src/ui/mainwindow.c tcm-2.20+TSQD/src/ui/mainwindow.c

1641

--- tcm-2.20+TSQD.orig/src/ui/mainwindow.c 2004-07-21 19:48:10.000000000 +0200

1642

+++ tcm-2.20+TSQD/src/ui/mainwindow.c 2006-04-02 15:13:09.000000000 +0200

1643

@@ -40,7 +40,7 @@

1644

SetWidget(XtCreatePopupShell(GetName()->getstr(),

1645

topLevelShellWidgetClass, theApplication->GetWidget(), 0, 0));

1646

XtVaSetValues(GetWidget(), XmNkeyboardFocusPolicy, XmPOINTER,

1647

- XmNmappedWhenManaged, False, 0);

1648

+ XmNmappedWhenManaged, False, NULL);

1649

InstallDestroyHandler();

1650

// Use a Motif XmMainWindow widget to handle window layout

1651

main = XtCreateManagedWidget(GetName()->getstr(), xmMainWindowWidgetClass,

1652

@@ -50,7 +50,7 @@

1653

config = c;

1654

workarea = CreateWorkArea(main, argc, argv);

1655

if(check(workarea)) {

1656

- XtVaSetValues(main, XmNworkWindow, workarea, 0);

1657

+ XtVaSetValues(main, XmNworkWindow, workarea, NULL);

1658

if(!XtIsManaged(workarea))

1659

XtManageChild(workarea);

1660

}

1661

@@ -82,7 +82,7 @@

1662

}

1663

1664

void MainWindow::ManageUnmapped() {

1665

- XtVaSetValues(GetWidget(), XmNmappedWhenManaged, False, 0);

1666

+ XtVaSetValues(GetWidget(), XmNmappedWhenManaged, False, NULL);

1667

MWidget::Manage();

1668

}

1669

1670

@@ -91,7 +91,7 @@

1671

return;

1672

// Set the widget to have an initial iconic state

1673

// in case the base widget has not yet been realized

1674

- XtVaSetValues(GetWidget(), XmNiconic, TRUE, 0);

1675

+ XtVaSetValues(GetWidget(), XmNiconic, TRUE, NULL);

1676

// If the widget has already been realized, iconify the window

1677

if (XtIsRealized(GetWidget()))

1678

XIconifyWindow(GetDisplay(), GetWindow(), 0);

1679

@@ -103,7 +103,7 @@

1680

1681

void MainWindow::SetTitle(const char *title) {

1682

if (check(GetWidget()))

1683

- XtVaSetValues(GetWidget(), XmNtitle, title, 0);

1684

+ XtVaSetValues(GetWidget(), XmNtitle, title, NULL);

1685

}

1686

1687

void MainWindow::SetTitle(const string *title) {

1688

@@ -112,13 +112,13 @@

1689

1690

void MainWindow::SetIconName(const char *iconname) {

1691

if (check(GetWidget()))

1692

- XtVaSetValues(GetWidget(), XmNiconName, iconname, 0);

1693

+ XtVaSetValues(GetWidget(), XmNiconName, iconname, NULL);

1694

}

1695

1696

void MainWindow::SetIconPixmap(Pixmap px) {

1697

if (!check(GetWidget()))

1698

return;

1699

- XtVaSetValues(GetWidget(), XmNiconPixmap, px, 0);

1700

+ XtVaSetValues(GetWidget(), XmNiconPixmap, px, NULL);

1701

}

1702

1703

PrinterOptions *MainWindow::GetPrinterOptions() {

1704

diff -Nur tcm-2.20+TSQD.orig/src/ui/menu.c tcm-2.20+TSQD/src/ui/menu.c

1705

--- tcm-2.20+TSQD.orig/src/ui/menu.c 2006-04-02 15:12:45.000000000 +0200

1706

+++ tcm-2.20+TSQD/src/ui/menu.c 2006-04-02 15:14:26.000000000 +0200

1707

@@ -43,13 +43,13 @@

1708

Widget submenu;

1709

WidgetList wlist; int numc;

1710

if (type == PULLDOWN)

1711

- XtVaGetValues(w, XmNsubMenuId, &submenu, 0);

1712

+ XtVaGetValues(w, XmNsubMenuId, &submenu, NULL);

1713

else

1714

submenu = w;

1715

if (!check(submenu))

1716

return 0;

1717

- XtVaGetValues(submenu, XmNchildren, &wlist, 0);

1718

- XtVaGetValues(submenu, XmNnumChildren, &numc, 0);

1719

+ XtVaGetValues(submenu, XmNchildren, &wlist, NULL);

1720

+ XtVaGetValues(submenu, XmNnumChildren, &numc, NULL);

1721

if (n <= numc)

1722

return wlist[n-1];

1723

else

1724

@@ -67,7 +67,7 @@

1725

bool state) {

1726

Widget child = GetNthChild(w, type, n);

1727

if (check(child))

1728

- XtVaSetValues(child, XmNsensitive, state, 0);

1729

+ XtVaSetValues(child, XmNsensitive, state, NULL);

1730

}

1731

1732

Widget Menu::GetMenuItem(const char *label) {

1733

@@ -78,17 +78,17 @@

1734

Widget submenu;

1735

WidgetList wlist; int numc;

1736

if (menuType == PULLDOWN)

1737

- XtVaGetValues(w, XmNsubMenuId, &submenu, 0);

1738

+ XtVaGetValues(w, XmNsubMenuId, &submenu, NULL);

1739

else

1740

submenu = w;

1741

if (!check(submenu))

1742

return 0;

1743

- XtVaGetValues(submenu, XmNchildren, &wlist, 0);

1744

- XtVaGetValues(submenu, XmNnumChildren, &numc, 0);

1745

+ XtVaGetValues(submenu, XmNchildren, &wlist, NULL);

1746

+ XtVaGetValues(submenu, XmNnumChildren, &numc, NULL);

1747

XmString s2;

1748

for (int i=0; i < numc; i++) {

1749

s2 = CreateXmString("");

1750

- XtVaGetValues(wlist[i], XmNlabelString, &s2, 0);

1751

+ XtVaGetValues(wlist[i], XmNlabelString, &s2, NULL);

1752

char *str;

1753

if (XmStringGetLtoR(s2, XmFONTLIST_DEFAULT_TAG, &str)) {

1754

// std::cout << str << std::endl;

1755

@@ -116,7 +116,7 @@

1756

const char *label, bool state) {

1757

Widget child = GetChild(w, type, label);

1758

if (check(child))

1759

- XtVaSetValues(child, XmNsensitive, state, 0);

1760

+ XtVaSetValues(child, XmNsensitive, state, NULL);

1761

}

1762

1763

// Build popup, option and pulldown menus, depending on the menu type.

1764

@@ -152,7 +152,7 @@

1765

xmCascadeButtonWidgetClass, parent,

1766

XmNsubMenuId, menu,

1767

XmNlabelString, str,

1768

- XmNmnemonic, mnemonic, 0);

1769

+ XmNmnemonic, mnemonic, NULL);

1770

XmStringFree(str);

1771

} else if (type == OPTION) {

1772

// Option menus are a special case, but not hard to handle

1773

@@ -199,7 +199,7 @@

1774

else

1775

wc = &xmPushButtonWidgetClass;

1776

submenu = XtVaCreateManagedWidget(items[i].label,

1777

- *wc, menu, 0);

1778

+ *wc, menu, NULL);

1779

}

1780

// toggle buttons are always visible as such

1781

if (items[i].itemType == MenuItem::RADIOBUTTON ||

1782

@@ -208,13 +208,13 @@

1783

XtVaSetValues(submenu, XmNindicatorOn, True,

1784

XmNvisibleWhenOff, True,

1785

XmNindicatorSize, 12,

1786

- 0);

1787

+ NULL);

1788

// box or diamond ?

1789

if (items[i].itemType == MenuItem::RADIOBUTTON) {

1790

XtVaSetValues(menu,

1791

- XmNradioBehavior, True, 0);

1792

+ XmNradioBehavior, True, NULL);

1793

XtVaSetValues(submenu,

1794

- XmNindicatorType, XmONE_OF_MANY, 0);

1795

+ XmNindicatorType, XmONE_OF_MANY, NULL);

1796

}

1797

// selected or not ?

1798

if ((long)items[i].userData & 0x1)

1799

@@ -223,22 +223,22 @@

1800

}

1801

if (items[i].userData)

1802

XtVaSetValues(submenu, XmNuserData,

1803

- items[i].userData, 0);

1804

+ items[i].userData, NULL);

1805

1806

// Whether the item is a real item or a cascade button with a

1807

// menu, it can still have a mnemonic.

1808

//

1809

if (items[i].mnemonic)

1810

XtVaSetValues(submenu, XmNmnemonic,

1811

- items[i].mnemonic, 0);

1812

+ items[i].mnemonic, NULL);

1813

// any item can have an accelerator, except cascade menus. But,

1814

// we don't worry about that; we know better in our

1815

// declarations.

1816

if (items[i].accelerator) {

1817

str = CreateXmString(items[i].accelText);

1818

- XtVaSetValues(submenu, XmNacceleratorText, str, 0);

1819

+ XtVaSetValues(submenu, XmNacceleratorText, str, NULL);

1820

XtVaSetValues(submenu, XmNaccelerator,

1821

- items[i].accelerator, 0);

1822

+ items[i].accelerator, NULL);

1823

XmStringFree(str);

1824

}

1825

1826

@@ -252,7 +252,7 @@

1827

items[i].callback, items[i].callbackData);

1828

1829

// set if item is selectable

1830

- XtVaSetValues(submenu, XmNsensitive, items[i].sensitive, 0);

1831

+ XtVaSetValues(submenu, XmNsensitive, items[i].sensitive, NULL);

1832

1833

if (items[i].showBitmap) {

1834

Bitmap b = items[i].bitmap;

1835

@@ -261,7 +261,7 @@

1836

XtDisplay(menu));

1837

XtVaSetValues(submenu,

1838

XmNlabelType, XmPIXMAP,

1839

- XmNlabelPixmap, px, 0);

1840

+ XmNlabelPixmap, px, NULL);

1841

}

1842

}

1843

}

1844

Binary files tcm-2.20+TSQD.orig/src/ui/.menu.c.rej.swp and tcm-2.20+TSQD/src/ui/.menu.c.rej.swp differ

1845

diff -Nur tcm-2.20+TSQD.orig/src/ui/messagedialog.c tcm-2.20+TSQD/src/ui/messagedialog.c

1846

--- tcm-2.20+TSQD.orig/src/ui/messagedialog.c 2004-07-21 19:47:54.000000000 +0200

1847

+++ tcm-2.20+TSQD/src/ui/messagedialog.c 2006-04-02 15:13:09.000000000 +0200

1848

@@ -39,7 +39,7 @@

1849

1850

void MessageDialog::SetMessageString(const char *s) {

1851

XmString msg = CreateXmString(s);

1852

- XtVaSetValues(GetWidget(), XmNmessageString, msg, 0);

1853

+ XtVaSetValues(GetWidget(), XmNmessageString, msg, NULL);

1854

XmStringFree(msg);

1855

}

1856

1857

diff -Nur tcm-2.20+TSQD.orig/src/ui/messagelogdialog.c tcm-2.20+TSQD/src/ui/messagelogdialog.c

1858

--- tcm-2.20+TSQD.orig/src/ui/messagelogdialog.c 2004-07-21 19:47:57.000000000 +0200

1859

+++ tcm-2.20+TSQD/src/ui/messagelogdialog.c 2006-04-02 15:13:09.000000000 +0200

1860

@@ -36,7 +36,7 @@

1861

XmNscrollHorizontal, False,

1862

XmNcolumns, 80,

1863

XmNblinkRate, 0,

1864

- XmNautoShowCursorPosition, True, 0);

1865

+ XmNautoShowCursorPosition, True, NULL);

1866

}

1867

1868

void MessageLogDialog::InsertText(const string *txt) {

1869

@@ -55,6 +55,6 @@

1870

wprPosition += tmp.length();

1871

XmTextInsert(GetTextWidget(), wprPosition, (char *)txt);

1872

wprPosition += strlen(txt);

1873

- XtVaSetValues(GetTextWidget(), XmNcursorPosition, wprPosition, 0);

1874

+ XtVaSetValues(GetTextWidget(), XmNcursorPosition, wprPosition, NULL);

1875

XmTextShowPosition(GetTextWidget(), wprPosition);

1876

}

1877

diff -Nur tcm-2.20+TSQD.orig/src/ui/modelcheckdialog.c tcm-2.20+TSQD/src/ui/modelcheckdialog.c

1878

--- tcm-2.20+TSQD.orig/src/ui/modelcheckdialog.c 2004-07-21 19:48:30.000000000 +0200

1879

+++ tcm-2.20+TSQD/src/ui/modelcheckdialog.c 2006-04-02 15:13:09.000000000 +0200

1880

@@ -45,39 +45,39 @@

1881

ManageSelectionLabel(False);

1882

1883

form = XtVaCreateWidget("form",

1884

- xmFormWidgetClass, GetWidget(), 0);

1885

+ xmFormWidgetClass, GetWidget(), NULL);

1886

SetSelectionLabel(XtVaCreateManagedWidget("Kronos formula to be checked",

1887

xmLabelWidgetClass, form,

1888

XmNleftAttachment, XmATTACH_FORM,

1889

- XmNtopAttachment, XmATTACH_FORM, 0));

1890

+ XmNtopAttachment, XmATTACH_FORM, NULL));

1891

SetText(XtVaCreateManagedWidget("formula",

1892

xmTextFieldWidgetClass, form,

1893

XmNleftAttachment, XmATTACH_FORM,

1894

XmNrightAttachment, XmATTACH_FORM,

1895

XmNtopAttachment, XmATTACH_WIDGET,

1896

- XmNtopWidget, GetSelectionLabel(), 0));

1897

+ XmNtopWidget, GetSelectionLabel(), NULL));

1898

internLabel = XtVaCreateManagedWidget("Internal events",

1899

xmLabelWidgetClass, GetForm(),

1900

XmNleftAttachment, XmATTACH_FORM,

1901

XmNtopAttachment, XmATTACH_WIDGET,

1902

- XmNtopWidget, GetText(), 0);

1903

+ XmNtopWidget, GetText(), NULL);

1904

internText = XtVaCreateManagedWidget("intern",

1905

xmTextFieldWidgetClass, GetForm(),

1906

XmNleftAttachment, XmATTACH_FORM,

1907

XmNrightAttachment, XmATTACH_FORM,

1908

XmNtopAttachment, XmATTACH_WIDGET,

1909

- XmNtopWidget, internLabel, 0);

1910

+ XmNtopWidget, internLabel, NULL);

1911

clockLabel = XtVaCreateManagedWidget("Clocks",

1912

xmLabelWidgetClass, GetForm(),

1913

XmNleftAttachment, XmATTACH_FORM,

1914

XmNtopAttachment, XmATTACH_WIDGET,

1915

- XmNtopWidget, internText, 0);

1916

+ XmNtopWidget, internText, NULL);

1917

clockText = XtVaCreateManagedWidget("clock",

1918

xmTextFieldWidgetClass, GetForm(),

1919

XmNleftAttachment, XmATTACH_FORM,

1920

XmNrightAttachment, XmATTACH_FORM,

1921

XmNtopAttachment, XmATTACH_WIDGET,

1922

- XmNtopWidget, clockLabel, 0);

1923

+ XmNtopWidget, clockLabel, NULL);

1924

XtManageChild(form);

1925

}

1926

1927

diff -Nur tcm-2.20+TSQD.orig/src/ui/mwidget.c tcm-2.20+TSQD/src/ui/mwidget.c

1928

--- tcm-2.20+TSQD.orig/src/ui/mwidget.c 2004-07-21 19:48:02.000000000 +0200

1929

+++ tcm-2.20+TSQD/src/ui/mwidget.c 2006-04-02 15:13:09.000000000 +0200

1930

@@ -67,7 +67,7 @@

1931

liteClue = XtVaCreatePopupShell("LiteClueShell",

1932

xcgLiteClueWidgetClass, GetWidget(),

1933

XgcNwaitPeriod, 700,

1934

- XgcNcancelWaitPeriod, 1000, 0);

1935

+ XgcNcancelWaitPeriod, 1000, NULL);

1936

}

1937

1938

bool MWidget::IsRealized() {

1939

@@ -85,7 +85,7 @@

1940

}

1941

1942

void MWidget::SetColormap(Colormap cmap) {

1943

- XtVaSetValues(GetWidget(), XmNcolormap, cmap, 0);

1944

+ XtVaSetValues(GetWidget(), XmNcolormap, cmap, NULL);

1945

XSetWindowColormap(GetDisplay(), XtWindow(GetWidget()), cmap);

1946

}

1947

1948

diff -Nur tcm-2.20+TSQD.orig/src/ui/nodealignmentdialog.c tcm-2.20+TSQD/src/ui/nodealignmentdialog.c

1949

--- tcm-2.20+TSQD.orig/src/ui/nodealignmentdialog.c 2004-07-21 19:48:18.000000000 +0200

1950

+++ tcm-2.20+TSQD/src/ui/nodealignmentdialog.c 2006-04-02 15:13:09.000000000 +0200

1951

@@ -79,5 +79,5 @@

1952

AddLiteClue((*tl)[4], "Align vertical");

1953

AddLiteClue((*tl)[5], "Align right");

1954

XtVaSetValues(rc, XmNnumColumns, 2,

1955

- XmNorientation, XmHORIZONTAL, 0);

1956

+ XmNorientation, XmHORIZONTAL, NULL);

1957

}

1958

diff -Nur tcm-2.20+TSQD.orig/src/ui/nodeshapedialog.c tcm-2.20+TSQD/src/ui/nodeshapedialog.c

1959

--- tcm-2.20+TSQD.orig/src/ui/nodeshapedialog.c 2004-07-21 19:48:24.000000000 +0200

1960

+++ tcm-2.20+TSQD/src/ui/nodeshapedialog.c 2006-04-02 15:13:09.000000000 +0200

1961

@@ -185,5 +185,5 @@

1962

AddLiteClue((*tl)[24], "Disk");

1963

AddLiteClue((*tl)[25], "Entity class");

1964

XtVaSetValues(rc, XmNnumColumns, 3,

1965

- XmNorientation, XmVERTICAL, 0);

1966

+ XmNorientation, XmVERTICAL, NULL);

1967

}

1968

diff -Nur tcm-2.20+TSQD.orig/src/ui/ntogglelistdialog.c tcm-2.20+TSQD/src/ui/ntogglelistdialog.c

1969

--- tcm-2.20+TSQD.orig/src/ui/ntogglelistdialog.c 2004-07-21 19:48:41.000000000 +0200

1970

+++ tcm-2.20+TSQD/src/ui/ntogglelistdialog.c 2006-04-02 15:13:09.000000000 +0200

1971

@@ -83,10 +83,10 @@

1972

for (unsigned j=0; j<labels->count(); j++) {

1973

Widget rc2 = XmCreateRowColumn(rc, wname, 0, 0);

1974

Widget frame = XtVaCreateManagedWidget(wname,

1975

- xmFrameWidgetClass, rc2, 0);

1976

+ xmFrameWidgetClass, rc2, NULL);

1977

XtVaCreateManagedWidget((*labels)[j]->getstr(),

1978

xmLabelWidgetClass, frame,

1979

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

1980

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

1981

Widget box = XmCreateRadioBox(frame, wname, 0, 0);

1982

List<string *> *t = (*items)[j];

1983

int i = 0;

1984

@@ -98,7 +98,7 @@

1985

xmToggleButtonWidgetClass, box,

1986

XmNuserData, i,

1987

XmNhighlightThickness, 0,

1988

- XmNset, i==0, 0);

1989

+ XmNset, i==0, NULL);

1990

toggles->add(w);

1991

}

1992

toggleList.add(toggles);

1993

@@ -108,7 +108,7 @@

1994

Widget w = XtVaCreateManagedWidget(s,

1995

xmToggleButtonWidgetClass, rc2,

1996

XmNhighlightThickness, 0,

1997

- XmNset, 0, 0);

1998

+ XmNset, 0, NULL);

1999

optionList.add(w);

2000

}

2001

XtManageChild(rc2);

2002

@@ -124,7 +124,7 @@

2003

Pixmap pixmap = bitmap->CreatePixmap(tb, GetDisplay());

2004

XtVaSetValues(tb,

2005

XmNlabelType, XmPIXMAP,

2006

- XmNlabelPixmap, pixmap, 0);

2007

+ XmNlabelPixmap, pixmap, NULL);

2008

}

2009

}

2010

}

2011

@@ -135,7 +135,7 @@

2012

List<Widget> *toggles = toggleList[n];

2013

if (check(i < toggles->count())) {

2014

XmString s = CreateXmString(txt->getstr());

2015

- XtVaSetValues((*toggles)[i], XmNlabelString, s, 0);

2016

+ XtVaSetValues((*toggles)[i], XmNlabelString, s, NULL);

2017

XmStringFree(s);

2018

}

2019

}

2020

@@ -146,7 +146,7 @@

2021

List<Widget> *toggles = toggleList[n];

2022

if (check(i < toggles->count())) {

2023

XmString s = CreateXmString("");

2024

- XtVaGetValues((*toggles)[i], XmNlabelString, &s, 0);

2025

+ XtVaGetValues((*toggles)[i], XmNlabelString, &s, NULL);

2026

char *str;

2027

if (XmStringGetLtoR(s, XmFONTLIST_DEFAULT_TAG, &str)) {

2028

*txt = str;

2029

@@ -170,7 +170,7 @@

2030

List<Widget> *toggles = toggleList[n];

2031

for (unsigned i=0; i<toggles->count(); i++) {

2032

XmString s = CreateXmString("");

2033

- XtVaGetValues((*toggles)[i], XmNlabelString, &s, 0);

2034

+ XtVaGetValues((*toggles)[i], XmNlabelString, &s, NULL);

2035

char *str;

2036

if (XmStringGetLtoR(s, XmFONTLIST_DEFAULT_TAG, &str)) {

2037

if (*t == str) {

2038

diff -Nur tcm-2.20+TSQD.orig/src/ui/replacedialog.c tcm-2.20+TSQD/src/ui/replacedialog.c

2039

--- tcm-2.20+TSQD.orig/src/ui/replacedialog.c 2004-07-21 19:48:17.000000000 +0200

2040

+++ tcm-2.20+TSQD/src/ui/replacedialog.c 2006-04-02 15:13:09.000000000 +0200

2041

@@ -37,24 +37,24 @@

2042

SetOKButtonLabel("Find\nNext");

2043

SetApplyButtonLabel("Replace\nAll");

2044

replaceButton = XtVaCreateManagedWidget("Replace",

2045

- xmPushButtonWidgetClass, GetWidget(), 0);

2046

+ xmPushButtonWidgetClass, GetWidget(), NULL);

2047

XmString t = CreateXmString("Replace\nNext");

2048

- XtVaSetValues(replaceButton, XmNlabelString, t, 0);

2049

+ XtVaSetValues(replaceButton, XmNlabelString, t, NULL);

2050

SetHelpCallback(ReplaceClearCB, this);

2051

replaceLabel = XtVaCreateManagedWidget("Replace with",

2052

xmLabelWidgetClass, GetForm(),

2053

XmNleftAttachment, XmATTACH_FORM,

2054

XmNtopAttachment, XmATTACH_WIDGET,

2055

- XmNtopWidget, GetText(), 0);

2056

+ XmNtopWidget, GetText(), NULL);

2057

replaceText = XtVaCreateManagedWidget("replace_text",

2058

xmTextFieldWidgetClass, GetForm(),

2059

XmNleftAttachment, XmATTACH_FORM,

2060

XmNrightAttachment, XmATTACH_FORM,

2061

XmNtopAttachment, XmATTACH_WIDGET,

2062

- XmNtopWidget, replaceLabel, 0);

2063

+ XmNtopWidget, replaceLabel, NULL);

2064

XtVaSetValues(GetToggleRC(),

2065

XmNtopAttachment, XmATTACH_WIDGET,

2066

- XmNtopWidget, replaceText, 0);

2067

+ XmNtopWidget, replaceText, NULL);

2068

XmStringFree(t);

2069

}

2070

2071

diff -Nur tcm-2.20+TSQD.orig/src/ui/scaledialog.c tcm-2.20+TSQD/src/ui/scaledialog.c

2072

--- tcm-2.20+TSQD.orig/src/ui/scaledialog.c 2004-07-21 19:48:16.000000000 +0200

2073

+++ tcm-2.20+TSQD/src/ui/scaledialog.c 2006-04-02 15:13:09.000000000 +0200

2074

@@ -37,7 +37,7 @@

2075

scale = XtVaCreateManagedWidget("scale",

2076

xmScaleWidgetClass, GetWidget(),

2077

XmNorientation, XmHORIZONTAL,

2078

- XmNshowValue, True, 0);

2079

+ XmNshowValue, True, NULL);

2080

}

2081

2082

void ScaleDialog::Configure() {

2083

@@ -54,7 +54,7 @@

2084

XmNmaximum, max,

2085

XmNminimum, min,

2086

XmNvalue, init,

2087

- XmNdecimalPoints, decimal, 0);

2088

+ XmNdecimalPoints, decimal, NULL);

2089

initValue = init;

2090

defaultValue = def;

2091

}

2092

@@ -64,7 +64,7 @@

2093

return;

2094

XmString text_string = CreateXmString(text);

2095

// XtVaTypedArg, XmNtitleString, XmRString, text, strlen(text),

2096

- XtVaSetValues(scale, XmNtitleString, text_string, 0);

2097

+ XtVaSetValues(scale, XmNtitleString, text_string, NULL);

2098

XmStringFree(text_string);

2099

}

2100

2101

diff -Nur tcm-2.20+TSQD.orig/src/ui/selectiondialog.c tcm-2.20+TSQD/src/ui/selectiondialog.c

2102

--- tcm-2.20+TSQD.orig/src/ui/selectiondialog.c 2004-07-21 19:48:45.000000000 +0200

2103

+++ tcm-2.20+TSQD/src/ui/selectiondialog.c 2006-04-02 15:13:09.000000000 +0200

2104

@@ -76,7 +76,7 @@

2105

if (!check(GetWidget()))

2106

return;

2107

XmString t = CreateXmString(v);

2108

- XtVaSetValues(GetWidget(), XmNselectionLabelString, t, 0);

2109

+ XtVaSetValues(GetWidget(), XmNselectionLabelString, t, NULL);

2110

XmStringFree(t);

2111

}

2112

2113

@@ -106,7 +106,7 @@

2114

if (!check(GetWidget()))

2115

return;

2116

XmString t = CreateXmString(txt);

2117

- XtVaSetValues(GetWidget(), XmNapplyLabelString, t, 0);

2118

+ XtVaSetValues(GetWidget(), XmNapplyLabelString, t, NULL);

2119

XmStringFree(t);

2120

}

2121

2122

diff -Nur tcm-2.20+TSQD.orig/src/ui/temporalpropertydialog.c tcm-2.20+TSQD/src/ui/temporalpropertydialog.c

2123

--- tcm-2.20+TSQD.orig/src/ui/temporalpropertydialog.c 2004-07-21 19:48:13.000000000 +0200

2124

+++ tcm-2.20+TSQD/src/ui/temporalpropertydialog.c 2006-04-02 15:13:09.000000000 +0200

2125

@@ -61,30 +61,30 @@

2126

//ManageSensitiveToggle(False);

2127

2128

form = XtVaCreateWidget("form",

2129

- xmFormWidgetClass, GetWidget(), 0);

2130

+ xmFormWidgetClass, GetWidget(), NULL);

2131

SetSelectionLabel(XtVaCreateManagedWidget("LTL property",

2132

xmLabelWidgetClass, form,

2133

XmNleftAttachment, XmATTACH_FORM,

2134

- XmNtopAttachment, XmATTACH_FORM, 0));

2135

+ XmNtopAttachment, XmATTACH_FORM, NULL));

2136

SetText(XtVaCreateManagedWidget("find_text",

2137

xmTextFieldWidgetClass, form,

2138

XmNleftAttachment, XmATTACH_FORM,

2139

XmNrightAttachment, XmATTACH_FORM,

2140

XmNtopAttachment, XmATTACH_WIDGET,

2141

- XmNtopWidget, GetSelectionLabel(), 0));

2142

+ XmNtopWidget, GetSelectionLabel(), NULL));

2143

toggleRC = XtVaCreateManagedWidget("toggleRC",

2144

xmRowColumnWidgetClass, form,

2145

XmNorientation, XmHORIZONTAL,

2146

- XmNleftAttachment, XmATTACH_FORM, 0);

2147

+ XmNleftAttachment, XmATTACH_FORM, NULL);

2148

sensitiveToggle = XtVaCreateManagedWidget("syntactic encoding",

2149

xmToggleButtonWidgetClass, toggleRC,

2150

- XmNset, False, 0);

2151

+ XmNset, False, NULL);

2152

substringToggle = XtVaCreateWidget("reduction",

2153

xmToggleButtonWidgetClass, toggleRC,

2154

- XmNset, False, 0);

2155

+ XmNset, False, NULL);

2156

nameOnlyToggle = XtVaCreateWidget("strong fairness",

2157

xmToggleButtonWidgetClass, toggleRC,

2158

- XmNset, True, 0);

2159

+ XmNset, True, NULL);

2160

AttachToggles();

2161

2162

XtManageChild(form);

2163

@@ -94,7 +94,7 @@

2164

void TPDialog::AttachToggles() {

2165

XtVaSetValues(toggleRC,

2166

XmNtopAttachment, XmATTACH_WIDGET,

2167

- XmNtopWidget, GetText(), 0);

2168

+ XmNtopWidget, GetText(), NULL);

2169

}

2170

2171

void TPDialog::ManageSensitiveToggle(bool b) {

2172

diff -Nur tcm-2.20+TSQD.orig/src/ui/textalignmentdialog.c tcm-2.20+TSQD/src/ui/textalignmentdialog.c

2173

--- tcm-2.20+TSQD.orig/src/ui/textalignmentdialog.c 2004-07-21 19:48:05.000000000 +0200

2174

+++ tcm-2.20+TSQD/src/ui/textalignmentdialog.c 2006-04-02 15:13:09.000000000 +0200

2175

@@ -92,5 +92,5 @@

2176

AddLiteClue((*tl)[1], "Center");

2177

AddLiteClue((*tl)[2], "Bottom");

2178

}

2179

- XtVaSetValues(rc, XmNnumColumns, 3, 0);

2180

+ XtVaSetValues(rc, XmNnumColumns, 3, NULL);

2181

}

2182

diff -Nur tcm-2.20+TSQD.orig/src/ui/texteditdialog.c tcm-2.20+TSQD/src/ui/texteditdialog.c

2183

--- tcm-2.20+TSQD.orig/src/ui/texteditdialog.c 2004-07-21 19:48:13.000000000 +0200

2184

+++ tcm-2.20+TSQD/src/ui/texteditdialog.c 2006-04-02 15:13:09.000000000 +0200

2185

@@ -35,7 +35,7 @@

2186

if (check(GetWidget())) {

2187

XtVaSetValues(GetTextWidget(),

2188

XmNeditable, True,

2189

- XmNcursorPositionVisible, True, 0);

2190

+ XmNcursorPositionVisible, True, NULL);

2191

ManageCancelButton(True);

2192

SetOKButtonLabel("Ok");

2193

XtManageChild(GetTextWidget());

2194

diff -Nur tcm-2.20+TSQD.orig/src/ui/textfieldlistdialog.c tcm-2.20+TSQD/src/ui/textfieldlistdialog.c

2195

--- tcm-2.20+TSQD.orig/src/ui/textfieldlistdialog.c 2004-07-21 19:48:11.000000000 +0200

2196

+++ tcm-2.20+TSQD/src/ui/textfieldlistdialog.c 2006-04-02 15:13:09.000000000 +0200

2197

@@ -60,18 +60,18 @@

2198

xmRowColumnWidgetClass, GetWidget(),

2199

XmNnumColumns, 2,

2200

XmNpacking, XmPACK_COLUMN,

2201

- XmNorientation, XmVERTICAL, 0);

2202

+ XmNorientation, XmVERTICAL, NULL);

2203

labels = new Widget[names->count()];

2204

for (names->first(); !names->done(); names->next()) {

2205

Widget w1 = XtVaCreateManagedWidget(names->cur()->getstr(),

2206

- xmLabelWidgetClass, rc, 0);

2207

+ xmLabelWidgetClass, rc, NULL);

2208

labels[numLabels] = w1;

2209

numLabels++;

2210

}

2211

textFields = new Widget[values->count()];

2212

for (values->first(); !values->done(); values->next()) {

2213

Widget w2 = XtVaCreateManagedWidget("field",

2214

- xmTextFieldWidgetClass, rc, 0);

2215

+ xmTextFieldWidgetClass, rc, NULL);

2216

XmTextSetString(w2, (char *)values->cur()->getstr());

2217

textFields[numTextFields] = w2;

2218

numTextFields++;

2219

@@ -83,7 +83,7 @@

2220

void TextFieldListDialog::SetFieldWidth(unsigned n) {

2221

fieldWidth = n;

2222

for (unsigned i=0; i<numTextFields; i++)

2223

- XtVaSetValues(textFields[i], XmNcolumns, n, 0);

2224

+ XtVaSetValues(textFields[i], XmNcolumns, n, NULL);

2225

}

2226

2227

unsigned TextFieldListDialog::NumFields() {

2228

@@ -92,13 +92,13 @@

2229

2230

void TextFieldListDialog::SetLabel(unsigned i, const string *n) {

2231

if (check(i < numLabels))

2232

- XtVaSetValues(labels[i], XmNvalue, n->getstr(), 0);

2233

+ XtVaSetValues(labels[i], XmNvalue, n->getstr(), NULL);

2234

}

2235

2236

void TextFieldListDialog::GetLabel(unsigned i, string *n) {

2237

if (check(i < numLabels)) {

2238

char *s;

2239

- XtVaGetValues(labels[i], XmNvalue, &s, 0);

2240

+ XtVaGetValues(labels[i], XmNvalue, &s, NULL);

2241

*n = s;

2242

XtFree(s);

2243

}

2244

diff -Nur tcm-2.20+TSQD.orig/src/ui/textviewdialog.c tcm-2.20+TSQD/src/ui/textviewdialog.c

2245

--- tcm-2.20+TSQD.orig/src/ui/textviewdialog.c 2004-07-21 19:48:24.000000000 +0200

2246

+++ tcm-2.20+TSQD/src/ui/textviewdialog.c 2006-04-02 15:13:09.000000000 +0200

2247

@@ -71,7 +71,7 @@

2248

Arg args[24]; int i = 0;

2249

XtSetArg(args[i], XmNautoUnmanage, GetAutoUnmanage()); i++;

2250

SetWidget(XmCreateMessageDialog(GetParent(), (char *)GetClassName(), args, i));

2251

- XtVaSetValues(XtParent(GetWidget()), XmNallowShellResize, True, 0);

2252

+ XtVaSetValues(XtParent(GetWidget()), XmNallowShellResize, True, NULL);

2253

}

2254

2255

void TextViewDialog::Configure() {

2256

@@ -89,7 +89,7 @@

2257

XtVaSetValues(menuBar,

2258

XmNtopAttachment, XmATTACH_FORM,

2259

XmNleftAttachment, XmATTACH_FORM,

2260

- XmNrightAttachment, XmATTACH_FORM, 0);

2261

+ XmNrightAttachment, XmATTACH_FORM, NULL);

2262

fileMenu = new Menu(menuBar, Menu::PULLDOWN, "File", 0, fileItems);

2263

editMenu = new Menu(menuBar, Menu::PULLDOWN, "Edit", 0, editItems);

2264

searchMenu = new Menu(menuBar, Menu::PULLDOWN, "Search", 0,

2265

@@ -97,7 +97,7 @@

2266

// create a manager widget as a child of the dialog, to be used

2267

// as the work area of the dialog, replacing the label and the icon.

2268

Widget form = XtVaCreateWidget("form1", xmFormWidgetClass,

2269

- GetWidget(), 0);

2270

+ GetWidget(), NULL);

2271

XtVaSetValues(form,

2272

XmNtopAttachment, XmATTACH_WIDGET,

2273

XmNtopWidget, menuBar,

2274

@@ -105,7 +105,7 @@

2275

XmNbottomAttachment, XmATTACH_WIDGET,

2276

XmNbottomWidget, XmMessageBoxGetChild(GetWidget(),

2277

XmDIALOG_SEPARATOR),

2278

- XmNrightAttachment, XmATTACH_FORM, 0);

2279

+ XmNrightAttachment, XmATTACH_FORM, NULL);

2280

// create text field.

2281

i = 0;

2282

XtSetArg(args[i], XmNeditable, False); i++;

2283

@@ -116,7 +116,7 @@

2284

XtVaSetValues(textStatus,

2285

XmNtopAttachment, XmATTACH_FORM,

2286

XmNleftAttachment, XmATTACH_FORM,

2287

- XmNrightAttachment, XmATTACH_FORM, 0);

2288

+ XmNrightAttachment, XmATTACH_FORM, NULL);

2289

i = 0;

2290

XtSetArg(args[i], XmNscrollVertical, True); i++;

2291

XtSetArg(args[i], XmNrows, 6); i++;

2292

@@ -135,7 +135,7 @@

2293

XmNtopWidget, textStatus,

2294

XmNrightAttachment, XmATTACH_FORM,

2295

XmNbottomAttachment, XmATTACH_FORM,

2296

- XmNleftAttachment, XmATTACH_FORM, 0);

2297

+ XmNleftAttachment, XmATTACH_FORM, NULL);

2298

XtManageChild(menuBar);

2299

XtManageChild(textStatus);

2300

XtManageChild(textWidget);

2301

@@ -361,14 +361,14 @@

2302

if (!check(textWidget))

2303

return;

2304

if (nrOfRows <= maxRows)

2305

- XtVaSetValues(textWidget, XmNrows, nrOfRows, 0);

2306

+ XtVaSetValues(textWidget, XmNrows, nrOfRows, NULL);

2307

}

2308

2309

void TextViewDialog::SetTextColumns(int nrOfColumns) {

2310

if (!check(textWidget))

2311

return;

2312

if (nrOfColumns <= maxColumns)

2313

- XtVaSetValues(textWidget, XmNcolumns, nrOfColumns, 0);

2314

+ XtVaSetValues(textWidget, XmNcolumns, nrOfColumns, NULL);

2315

}

2316

2317

void TextViewDialog::SetTextSize(int nrOfRows, int nrOfColumns) {

2318

@@ -382,11 +382,11 @@

2319

if (!check(textWidget))

2320

return;

2321

short rows, columns;

2322

- XtVaGetValues(textWidget, XmNrows, &rows, XmNcolumns, &columns, 0);

2323

+ XtVaGetValues(textWidget, XmNrows, &rows, XmNcolumns, &columns, NULL);

2324

if (rows > maxRows)

2325

- XtVaSetValues(textWidget, XmNrows, &maxRows, 0);

2326

+ XtVaSetValues(textWidget, XmNrows, &maxRows, NULL);

2327

if (columns > maxColumns)

2328

- XtVaSetValues(textWidget, XmNcolumns, &maxColumns, 0);

2329

+ XtVaSetValues(textWidget, XmNcolumns, &maxColumns, NULL);

2330

}

2331

2332

void TextViewDialog::Print() {

2333

@@ -469,7 +469,7 @@

2334

char *s = (char *)text.getstr();

2335

XmTextSetString(textWidget, s);

2336

short c;

2337

- XtVaGetValues(textWidget, XmNcolumns, &c, 0);

2338

+ XtVaGetValues(textWidget, XmNcolumns, &c, NULL);

2339

SetStatus("Load succeeded");

2340

return True;

2341

}

2342

diff -Nur tcm-2.20+TSQD.orig/src/ui/togglelistdialog.c tcm-2.20+TSQD/src/ui/togglelistdialog.c

2343

--- tcm-2.20+TSQD.orig/src/ui/togglelistdialog.c 2004-07-21 19:48:44.000000000 +0200

2344

+++ tcm-2.20+TSQD/src/ui/togglelistdialog.c 2006-04-02 15:13:09.000000000 +0200

2345

@@ -71,10 +71,10 @@

2346

toggleList = new Widget[items->count()];

2347

if (*label != "") {

2348

Widget frame = XtVaCreateManagedWidget("frame",

2349

- xmFrameWidgetClass, toggleBox, 0);

2350

+ xmFrameWidgetClass, toggleBox, NULL);

2351

XtVaCreateManagedWidget(label->getstr(),

2352

xmLabelWidgetClass, frame,

2353

- XmNchildType, XmFRAME_TITLE_CHILD, 0);

2354

+ XmNchildType, XmFRAME_TITLE_CHILD, NULL);

2355

}

2356

for (items->first(); !items->done(); items->next()) {

2357

const char *s = items->cur()->getstr();

2358

@@ -83,7 +83,7 @@

2359

xmToggleButtonWidgetClass, toggleBox,

2360

XmNuserData, i,

2361

XmNhighlightThickness, 0,

2362

- XmNset, i==0, 0);

2363

+ XmNset, i==0, NULL);

2364

toggleList[numToggles] = w;

2365

numToggles++;

2366

i++;

2367

@@ -106,14 +106,14 @@

2368

Pixmap pixmap = bitmap->CreatePixmap(tb, GetDisplay());

2369

XtVaSetValues(tb,

2370

XmNlabelType, XmPIXMAP,

2371

- XmNlabelPixmap, pixmap, 0);

2372

+ XmNlabelPixmap, pixmap, NULL);

2373

}

2374

}

2375

2376

void ToggleListDialog::SetToggleText(unsigned i, const string *txt) {

2377

if (check(i < numToggles)) {

2378

XmString s = CreateXmString(txt->getstr());

2379

- XtVaSetValues(toggleList[i], XmNlabelString, s, 0);

2380

+ XtVaSetValues(toggleList[i], XmNlabelString, s, NULL);

2381

XmStringFree(s);

2382

}

2383

}

2384

@@ -121,7 +121,7 @@

2385

void ToggleListDialog::GetToggleText(unsigned i, string *txt) {

2386

if (check(i < numToggles)) {

2387

XmString s = CreateXmString("");

2388

- XtVaGetValues(toggleList[i], XmNlabelString, &s, 0);

2389

+ XtVaGetValues(toggleList[i], XmNlabelString, &s, NULL);

2390

char *str;

2391

if (XmStringGetLtoR(s, XmFONTLIST_DEFAULT_TAG, &str)) {

2392

*txt = str;