1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
|
diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C
--- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 2005-11-10 20:48:22.000000000 +0100
+++ dx-4.4.4/src/uipp/startup/StartupApplication.C 2008-01-07 21:55:03.000000000 +0100
@@ -117,7 +117,7 @@ InitializeSignals(void)
#endif
}
-boolean StartupApplication::initialize(unsigned int* argcp,
+boolean StartupApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h
--- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 2003-09-20 07:33:56.000000000 +0200
+++ dx-4.4.4/src/uipp/startup/StartupApplication.h 2008-01-07 21:50:47.000000000 +0100
@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp, char**argv);
+ virtual boolean initialize(int* argcp, char**argv);
CommandScope *commandScope; // command scope
diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
--- dx-4.4.4/src/uipp/startup/Main.C.gcc43 2000-05-16 20:53:07.000000000 +0200
+++ dx-4.4.4/src/uipp/startup/Main.C 2008-01-07 19:57:58.000000000 +0100
@@ -14,7 +14,7 @@
extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main( int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
--- dx-4.4.4/src/uipp/base/Application.C.gcc43 2005-11-09 19:56:17.000000000 +0100
+++ dx-4.4.4/src/uipp/base/Application.C 2008-01-07 22:39:15.000000000 +0100
@@ -136,7 +136,7 @@ void Application::installDefaultResource
//this->setDefaultResources(baseWidget, Application::DefaultResources);
}
-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean Application::initializeWindowSystem(int *argcp, char **argv)
{
//
@@ -149,7 +149,7 @@ boolean Application::initializeWindowSys
NULL, // command line options table
0, // number of entries in options table
#if XtSpecificationRelease > 4
- (int*)argcp,
+ argcp,
#else
argcp,
#endif
@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
return TRUE;
}
-void Application::parseCommand(unsigned int* argcp, char** argv,
+void Application::parseCommand(int* argcp, char** argv,
XrmOptionDescList optlist, int optlistsize)
{
char res_file[256];
@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned
//
}
-boolean Application::initialize(unsigned int* argcp, char** argv)
+boolean Application::initialize(int* argcp, char** argv)
{
//
// Initialize the window system if not done already.
diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
--- dx-4.4.4/src/uipp/base/Application.h.gcc43 2005-11-09 19:26:29.000000000 +0100
+++ dx-4.4.4/src/uipp/base/Application.h 2008-01-07 21:49:49.000000000 +0100
@@ -49,7 +49,7 @@ class Application : public UIComponent,
//
// The main program needs to access protected member functions.
//
- friend int main(unsigned int argc,
+ friend int main( int argc,
char** argv);
@@ -71,9 +71,9 @@ class Application : public UIComponent,
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
- virtual void parseCommand(unsigned int* argcp, char** argv,
+ virtual void parseCommand(int* argcp, char** argv,
XrmOptionDescList optlist, int optlistsize);
//
@@ -145,7 +145,7 @@ class Application : public UIComponent,
// Initializes any Application specfic state. This routine should
// be called by main() or subclasses only.
//
- virtual boolean initialize(unsigned int* argcp, char** argv);
+ virtual boolean initialize(int* argcp, char** argv);
//
// Allow others to access our event processing mechanism
diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C
--- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 2004-04-02 22:32:43.000000000 +0200
+++ dx-4.4.4/src/uipp/base/IBMApplication.C 2008-01-07 21:53:29.000000000 +0100
@@ -349,7 +349,7 @@ int status;
}
-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
+boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
{
if (!this->Application::initializeWindowSystem(argcp, argv))
@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow
return TRUE;
}
-boolean IBMApplication::initialize(unsigned int* argcp,
+boolean IBMApplication::initialize(int* argcp,
char** argv)
{
if (!this->Application::initialize(argcp,argv))
diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h
--- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 2003-09-20 07:35:22.000000000 +0200
+++ dx-4.4.4/src/uipp/base/IBMApplication.h 2008-01-07 21:50:19.000000000 +0100
@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
//
// Initialize the window system.
//
- virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
+ virtual boolean initializeWindowSystem(int *argcp, char **argv);
//
// Protected member data:
@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
HelpWin *helpWindow;
- boolean initialize(unsigned int* argcp, char** argv);
+ boolean initialize(int* argcp, char** argv);
//
// Load application specific action routines
diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h
--- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 1999-05-10 17:46:30.000000000 +0200
+++ dx-4.4.4/src/uipp/tutor/TutorApplication.h 2008-01-07 21:49:29.000000000 +0100
@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
--- dx-4.4.4/src/uipp/tutor/Main.C.gcc43 2000-05-16 20:53:15.000000000 +0200
+++ dx-4.4.4/src/uipp/tutor/Main.C 2008-01-07 19:57:39.000000000 +0100
@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main( int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C
--- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 2006-05-08 18:20:14.000000000 +0200
+++ dx-4.4.4/src/uipp/tutor/TutorApplication.C 2008-01-07 21:56:09.000000000 +0100
@@ -196,7 +196,7 @@ InitializeSignals(void)
#endif
}
-boolean TutorApplication::initialize(unsigned int* argcp,
+boolean TutorApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 2006-01-03 01:12:34.000000000 +0100
+++ dx-4.4.4/src/uipp/widgets/MultiText.h 2008-01-07 19:06:27.000000000 +0100
@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
#define XmNsmoothScroll "smoothScroll"
#define XmNwaitCursorCount "waitCursorCount"
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
#define XmNmarginHeight "marginHeight"
#define XmNmarginWidth "marginWidth"
#define XmNwordWrap "wordWrap"
@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
#define XmCSmoothScroll "SmoothScroll"
#define XmCWaitCursorCount "WaitCursorCount"
-#if !(defined(_Xm_h) || defined(XM_H))
+#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
#define XmCMarginHeight "MarginHeight"
#define XmCMarginWidth "MarginWidth"
#define XmCWordWrap "WordWrap"
diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
--- dx-4.4.4/src/uipp/dxui/Main.C.gcc43 2005-12-07 18:50:53.000000000 +0100
+++ dx-4.4.4/src/uipp/dxui/Main.C 2008-01-07 19:57:21.000000000 +0100
@@ -48,7 +48,7 @@ extern unsigned long _etext;
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main( int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h
--- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 2003-09-20 07:33:21.000000000 +0200
+++ dx-4.4.4/src/uipp/prompter/GARApplication.h 2008-01-07 21:49:05.000000000 +0100
@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
CommandScope *commandScope; // command scope
diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
--- dx-4.4.4/src/uipp/prompter/Main.C.gcc43 2000-05-16 20:52:59.000000000 +0200
+++ dx-4.4.4/src/uipp/prompter/Main.C 2008-01-07 19:57:01.000000000 +0100
@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
#endif
-int main(unsigned int argc,
+int main( int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C
--- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200
+++ dx-4.4.4/src/uipp/prompter/GARApplication.C 2008-01-07 21:54:28.000000000 +0100
@@ -198,7 +198,7 @@ InitializeSignals(void)
}
}
-boolean GARApplication::initialize(unsigned int* argcp,
+boolean GARApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h
--- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 2006-05-08 18:20:10.000000000 +0200
+++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h 2008-01-07 21:14:12.000000000 +0100
@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
//
diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C
--- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 2006-06-22 21:45:34.000000000 +0200
+++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C 2008-01-07 21:32:56.000000000 +0100
@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
this->setDefaultResources(baseWidget, _defaultDXResources);
this->IBMApplication::installDefaultResources(baseWidget);
}
-boolean DXApplication::initialize(unsigned int* argcp,
+boolean DXApplication::initialize(int* argcp,
char** argv)
{
boolean wasSetBusy = FALSE;
diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
--- dx-4.4.4/src/uipp/mb/Main.C.gcc43 2000-05-20 19:49:40.000000000 +0200
+++ dx-4.4.4/src/uipp/mb/Main.C 2008-01-07 19:56:41.000000000 +0100
@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
//
const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
-int main(unsigned int argc,
+int main( int argc,
char** argv)
{
#if defined(HAVE_HCLXMINIT)
diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C
--- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 2006-05-08 18:20:13.000000000 +0200
+++ dx-4.4.4/src/uipp/mb/MBApplication.C 2008-01-07 21:51:15.000000000 +0100
@@ -117,7 +117,7 @@ InitializeSignals(void)
#endif
}
-boolean MBApplication::initialize(unsigned int* argcp,
+boolean MBApplication::initialize(int* argcp,
char** argv)
{
ASSERT(argcp);
diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h
--- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 1999-05-10 17:46:25.000000000 +0200
+++ dx-4.4.4/src/uipp/mb/MBApplication.h 2008-01-07 21:48:38.000000000 +0100
@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
// Overrides the Application class version:
// Initializes Xt Intrinsics with option list (switches).
//
- virtual boolean initialize(unsigned int* argcp,
+ virtual boolean initialize(int* argcp,
char** argv);
static MBResource resource;
|
GitWeb